Merge branch 'hotfix/1.1.2'

2013-07-26 11:39:04 +02:00 · 2013-07-26 11:39:04 +02:00 · 9956194d4c
commit 9956194d4c
parent 6ddf23ff34 5ef8d0d542
3 changed files with 9 additions and 5 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -1,6 +1,10 @@
 Changelog
 =========

+1.1.2
+-----
+* Updated gems
+
 1.1.1
 -----
 * Updated gems
--- a/Gemfile.lock
+++ b/Gemfile.lock
@ -139,13 +139,13 @@ GEM
    multi_json (1.7.7)
    nokogiri (1.6.0)
      mini_portile (~> 0.5.0)
-    pg (0.15.1)
+    pg (0.16.0)
    polyglot (0.3.3)
    pry (0.9.12.2)
      coderay (~> 1.0.5)
      method_source (~> 0.8)
      slop (~> 3.4)
-    pry-rails (0.3.1)
+    pry-rails (0.3.2)
      pry (>= 0.9.10)
    puma (2.4.0)
      rack (>= 1.1, < 2.0)
@ -208,7 +208,7 @@ GEM
      multi_json (~> 1.0)
      simplecov-html (~> 0.7.1)
    simplecov-html (0.7.1)
-    slop (3.4.5)
+    slop (3.4.6)
    sprockets (2.10.0)
      hike (~> 1.2)
      multi_json (~> 1.0)
@ -222,7 +222,7 @@ GEM
      libv8 (~> 3.11.8.12)
      ref
    thor (0.18.1)
-    thread_safe (0.1.0)
+    thread_safe (0.1.2)
      atomic
    tilt (1.4.1)
    treetop (1.4.14)
--- a/2
+++ b/2
@ -1 +1 @@
-1.1.1
+1.1.2
 @ -1 +1 @@
 .1.1
 .1.2