Merge pull request #87 from jasnow/master

Upgraded 2 gems by refreshing Gemfile.lock file
This commit is contained in:
mccabe615
2014-01-27 09:57:00 -08:00
+2 -2
View File
@@ -117,7 +117,7 @@ GEM
em-websocket (~> 0.5) em-websocket (~> 0.5)
guard (~> 2.0) guard (~> 2.0)
multi_json (~> 1.8) multi_json (~> 1.8)
guard-rspec (4.2.4) guard-rspec (4.2.5)
guard (~> 2.1) guard (~> 2.1)
rspec (>= 2.14, < 4.0) rspec (>= 2.14, < 4.0)
guard-shell (0.6.1) guard-shell (0.6.1)
@@ -231,7 +231,7 @@ GEM
sexp_processor (~> 4.0) sexp_processor (~> 4.0)
ruby_parser (3.2.2) ruby_parser (3.2.2)
sexp_processor (~> 4.1) sexp_processor (~> 4.1)
sass (3.2.13) sass (3.2.14)
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)