Merge pull request #155 from jasnow/master

Upgraded 2 gems by rebuilding Gemfile.lock file
This commit is contained in:
Ken Johnson
2014-09-29 13:34:45 -04:00
+2 -2
View File
@@ -145,7 +145,7 @@ GEM
launchy (2.4.2)
addressable (~> 2.3)
libv8 (3.16.14.7)
listen (2.7.9)
listen (2.7.11)
celluloid (>= 0.15.2)
rb-fsevent (>= 0.9.3)
rb-inotify (>= 0.9)
@@ -232,7 +232,7 @@ GEM
rspec-core (~> 2.14.0)
rspec-expectations (~> 2.14.0)
rspec-mocks (~> 2.14.0)
ruby2ruby (2.1.2)
ruby2ruby (2.1.3)
ruby_parser (~> 3.1)
sexp_processor (~> 4.0)
ruby_parser (3.5.0)