Merge branch 'develop' of github.com:amooma/GS5 into develop

1 files changed, 13 insertions, 13 deletions

diff --git a/Gemfile.lock b/Gemfile.lock
index ad47697..8491109 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -34,9 +34,9 @@ GEM
       open4 (~> 1.3.0)
       thor (>= 0.15.4, < 2)
     bcrypt-ruby (3.0.1)
-    better_errors (0.3.2)
+    better_errors (0.5.0)
       coderay (>= 1.0.0)
-      erubis (>= 2.7.0)
+      erubis (>= 2.6.6)
     binding_of_caller (0.6.8)
     breadcrumbs_on_rails (2.3.0)
     builder (3.0.4)
@@ -64,9 +64,9 @@ GEM
       compass (>= 0.12.2, < 0.14)
     daemons (1.1.9)
     dalli (2.6.2)
-    delayed_job (3.0.4)
+    delayed_job (3.0.5)
       activesupport (~> 3.0)
-    delayed_job_active_record (0.3.3)
+    delayed_job_active_record (0.4.0)
       activerecord (>= 2.1.0, < 4)
       delayed_job (~> 3.0)
     erubis (2.7.0)
@@ -75,7 +75,7 @@ GEM
       multi_json (~> 1.0)
     factory_girl (4.2.0)
       activesupport (>= 3.0.0)
-    factory_girl_rails (4.2.0)
+    factory_girl_rails (4.2.1)
       factory_girl (~> 4.2.0)
       railties (>= 3.0.0)
     fssm (0.2.10)
@@ -86,10 +86,10 @@ GEM
     i18n (0.6.1)
     inifile (2.0.2)
     journey (1.0.4)
-    jquery-rails (2.2.0)
+    jquery-rails (2.2.1)
       railties (>= 3.0, < 5.0)
       thor (>= 0.14, < 2.0)
-    json (1.7.6)
+    json (1.7.7)
     kgio (2.8.0)
     macaddr (1.6.1)
       systemu (~> 2.5.0)
@@ -97,20 +97,20 @@ GEM
       i18n (>= 0.4.0)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
-    mime-types (1.19)
+    mime-types (1.21)
     mini_magick (3.4)
       subexec (~> 0.2.1)
-    multi_json (1.5.0)
+    multi_json (1.5.1)
     mysql2 (0.3.11)
     nokogiri (1.5.6)
     open4 (1.3.0)
     polyglot (0.3.3)
     quiet_assets (1.0.1)
       railties (~> 3.1)
-    rack (1.4.4)
+    rack (1.4.5)
     rack-cache (1.2)
       rack (>= 0.4)
-    rack-ssl (1.3.2)
+    rack-ssl (1.3.3)
       rack
     rack-test (0.6.2)
       rack (>= 1.0)
@@ -131,7 +131,7 @@ GEM
       thor (>= 0.14.6, < 2.0)
     raindrops (0.10.0)
     rake (10.0.3)
-    rdoc (3.12)
+    rdoc (3.12.1)
       json (~> 1.4)
     sass (3.2.5)
     sass-rails (3.2.6)
@@ -170,7 +170,7 @@ GEM
     uglifier (1.3.0)
       execjs (>= 0.3.0)
       multi_json (~> 1.0, >= 1.0.2)
-    unicorn (4.5.0)
+    unicorn (4.6.0)
       kgio (~> 2.6)
       rack
       raindrops (~> 0.7)