Merge pull request #116 from jasnow/master

Upgraded 2 gems by rebuilding Gemfile.lock file
This commit is contained in:
Ken Johnson
2014-05-05 09:54:47 -04:00
+2 -2
View File
@@ -145,7 +145,7 @@ GEM
launchy (2.4.2) launchy (2.4.2)
addressable (~> 2.3) addressable (~> 2.3)
libv8 (3.16.14.3) libv8 (3.16.14.3)
listen (2.7.3) listen (2.7.4)
celluloid (>= 0.15.2) celluloid (>= 0.15.2)
celluloid-io (>= 0.15.0) celluloid-io (>= 0.15.0)
rb-fsevent (>= 0.9.3) rb-fsevent (>= 0.9.3)
@@ -241,7 +241,7 @@ GEM
ruby_parser (3.4.1) ruby_parser (3.4.1)
sexp_processor (~> 4.1) sexp_processor (~> 4.1)
safe_yaml (0.9.7) safe_yaml (0.9.7)
sass (3.3.6) sass (3.3.7)
sass-rails (3.2.6) sass-rails (3.2.6)
railties (~> 3.2.0) railties (~> 3.2.0)
sass (>= 3.1.10) sass (>= 3.1.10)