Merge pull request #143 from jasnow/master

Upgraded 2 gems by rebuilding Gemfile.lock file
This commit is contained in:
Ken Johnson
2014-07-29 08:28:17 -05:00
+2 -2
View File
@@ -120,7 +120,7 @@ GEM
em-websocket (~> 0.5)
guard (~> 2.0)
multi_json (~> 1.8)
guard-rspec (4.2.10)
guard-rspec (4.3.1)
guard (~> 2.1)
rspec (>= 2.14, < 4.0)
guard-shell (0.6.1)
@@ -236,7 +236,7 @@ GEM
sexp_processor (~> 4.0)
ruby_parser (3.5.0)
sexp_processor (~> 4.1)
sass (3.3.10)
sass (3.3.11)
sass-rails (3.2.6)
railties (~> 3.2.0)
sass (>= 3.1.10)