Merge pull request #122 from jasnow/master

Upgraded 2 gems and then rebuilt Gemfile.lock file
This commit is contained in:
Ken Johnson
2014-05-22 12:59:25 -06:00
+2 -2
View File
@@ -114,7 +114,7 @@ GEM
guard-brakeman (0.8.1)
brakeman (>= 2.1.1)
guard (>= 1.1.0)
guard-livereload (2.1.2)
guard-livereload (2.2.0)
em-websocket (~> 0.5)
guard (~> 2.0)
multi_json (~> 1.8)
@@ -163,7 +163,7 @@ GEM
method_source (0.8.2)
mime-types (1.25.1)
mini_portile (0.5.3)
multi_json (1.10.0)
multi_json (1.10.1)
multi_test (0.1.1)
mysql2 (0.3.16)
nokogiri (1.6.1)