Merge branch 'work'

zakuni · Nov 9, 2013 · dcb0a58 · dcb0a58
2 parents 1e7720e + 2dd9a63
commit dcb0a58
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/Gemfile b/Gemfile
@@ -1,6 +1,6 @@
 ruby '2.0.0'
 source "https://rubygems.org"
-gem "sinatra"
+gem "sinatra", :require => ["sinatra", "sinatra/base"]
 gem 'padrino-sprockets', :git => "https://github.com/nightsailer/padrino-sprockets.git", :require => "padrino/sprockets"
 gem 'sinatra-rocketio', :require => "sinatra/rocketio"