Merge branch 'hotfix/1.0.6' into develop

2013-07-14 12:04:28 +02:00 · 2013-07-14 12:04:28 +02:00 · 9def4048d2
commit 9def4048d2
parent 59fc45d93f b0f90baf2e
3 changed files with 7 additions and 3 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -1,6 +1,10 @@
 Changelog
 =========

+1.0.6
+-----
+* Updated gems
+
 1.0.5
 -----
 * Updated gems
--- a/Gemfile.lock
+++ b/Gemfile.lock
@ -181,7 +181,7 @@ GEM
      rspec-core (~> 2.14.0)
      rspec-expectations (~> 2.14.0)
      rspec-mocks (~> 2.14.0)
-    rspec-core (2.14.2)
+    rspec-core (2.14.3)
    rspec-expectations (2.14.0)
      diff-lcs (>= 1.1.3, < 2.0)
    rspec-mocks (2.14.1)
@ -231,7 +231,7 @@ GEM
    turbolinks (1.3.0)
      coffee-rails
    tzinfo (0.3.37)
-    uglifier (2.1.1)
+    uglifier (2.1.2)
      execjs (>= 0.3.0)
      multi_json (~> 1.0, >= 1.0.2)
    unicorn (4.6.3)
--- a/2
+++ b/2
@ -1 +1 @@
-1.0.5
+1.0.6
 @ -1 +1 @@
 .0.5
 .0.6