diff options
author | mr <mr@mrautenberg.de> | 2011-09-23 13:06:23 +0200 |
---|---|---|
committer | mr <mr@mrautenberg.de> | 2011-09-23 13:06:23 +0200 |
commit | c63aa4c06c63851b90c60212ed9d73f50652a02f (patch) | |
tree | 1164d5426cb4aa2b8d2fb7e10ea991cfe187143e | |
parent | 36f4648a8fac84f15328aa729b2ea717e40960d6 (diff) | |
parent | 778c58cad1c6a5b81655d731992c64a0efcec592 (diff) |
Merge branch 'master' into development
-rw-r--r-- | application.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/application.rb b/application.rb index 2b320e0..6d9ea76 100644 --- a/application.rb +++ b/application.rb @@ -1,7 +1,7 @@ ['rubygems', "haml", "sass", "rack-flash"].each do |lib| require lib end -gem "opentox-ruby", "~> 2" +gem "opentox-ruby", "~> 3" require 'opentox-ruby' gem 'sinatra-static-assets' require 'sinatra/static_assets' |