Merge branch '1-6-stable'

Conflicts: CHANGELOG.md
2022-11-09 12:32:45 -05:00 · 2014-01-11 14:22:00 -08:00 · 2014-01-11 14:22:00 -08:00 · 171d1f5021
commit 171d1f5021
parent cf00da9f8b ccf9e16e05
3 changed files with 7 additions and 2 deletions
--- a/.travis.yml
+++ b/.travis.yml
@ -1,3 +1,8 @@
+before_install:
+  - gem update bundler
+  - bundle --version
+  - gem update --system 2.1.11
+  - gem --version
 rvm:
  - 1.8.7
  - 1.9.2
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -1,4 +1,4 @@
-## 1.6.0.rc1 (2013-12-03)
+## 1.6.0 (2014-01-13)

 Features:

--- a/lib/omniauth/facebook/version.rb
+++ b/lib/omniauth/facebook/version.rb
@ -1,5 +1,5 @@
 module OmniAuth
  module Facebook
-    VERSION = "1.6.0.rc1"
+    VERSION = "1.6.0"
  end
 end