Merge pull request #117 from jasnow/master

Upgraded 1 gem by rebuilding Gemfile.lock file
2014-05-07 12:23:20 -04:00
parent 302fdd0c96 002c82547f
commit 4ea2552b63
1 changed files with 1 additions and 1 deletions
@@ -167,7 +167,7 @@ GEM
    method_source (0.8.2)
    mime-types (1.25.1)
    mini_portile (0.5.3)
-    multi_json (1.9.3)
+    multi_json (1.10.0)
    multi_test (0.1.1)
    mysql2 (0.3.15)
    nio4r (1.0.0)