summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuel Giddins <segiddins@segiddins.me>2016-10-15 01:15:36 -0500
committerSamuel Giddins <segiddins@segiddins.me>2016-10-15 01:15:36 -0500
commit7327dc59476c79547170d3ef8162f24b3aea385f (patch)
treed84caeddb1f16169be3c12b7a09f21c61729a42d
parent9b12e554a537489bce2bc57f3b24cd7695c0aa77 (diff)
parentaf6ac0a392966ca8a1d7a2924e4f834d7d5369d5 (diff)
downloadbundler-7327dc59476c79547170d3ef8162f24b3aea385f.tar.gz
Merge tag 'v1.13.5'
Version 1.13.5
-rw-r--r--CHANGELOG.md6
-rw-r--r--lib/bundler/version.rb2
2 files changed, 7 insertions, 1 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5499bc828e..a765ba621a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,9 @@
+## 1.13.5 (2016-10-15)
+
+Bugfixes:
+
+ - Ensure a locked pre-release spec can always be re-resolved (#5089, @segiddins)
+
## 1.13.4 (2016-10-11)
Bugfixes:
diff --git a/lib/bundler/version.rb b/lib/bundler/version.rb
index 823045b3f8..9882c7ac0f 100644
--- a/lib/bundler/version.rb
+++ b/lib/bundler/version.rb
@@ -7,5 +7,5 @@ module Bundler
# We're doing this because we might write tests that deal
# with other versions of bundler and we are unsure how to
# handle this better.
- VERSION = "1.13.4" unless defined?(::Bundler::VERSION)
+ VERSION = "1.13.5" unless defined?(::Bundler::VERSION)
end