summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristoph Helma <helma@in-silico.ch>2012-05-09 12:13:29 +0000
committerChristoph Helma <helma@in-silico.ch>2012-05-09 12:13:29 +0000
commitbb118c23c0f1eee3aa7dfc913f2a964393f6aa50 (patch)
treea82bce098d59035d753d20d620d4b45ecb5d62cc
parent69927997324657533dcf7bde8d83fcadae401763 (diff)
parent1bc2934762f7c3cbae20c5a24e9748cb28941581 (diff)
Merge branch 'feature/task' of github.com:opentox/opentox-server into feature/task
-rw-r--r--.gitignore1
-rw-r--r--opentox-server.gemspec1
2 files changed, 1 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore
index 9821c6e..c9daf01 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,5 +2,4 @@ Gemfile.lock
*.gem
.bundle
pkg/*
-Gemfile.lock
*~
diff --git a/opentox-server.gemspec b/opentox-server.gemspec
index 3d694c7..199a67a 100644
--- a/opentox-server.gemspec
+++ b/opentox-server.gemspec
@@ -25,6 +25,7 @@ Gem::Specification.new do |s|
s.add_runtime_dependency 'sinatra'
s.add_runtime_dependency 'sinatra-contrib'
s.add_runtime_dependency 'roo'
+ s.add_runtime_dependency 'spreadsheet', "= 0.6.8" # cannot load 0.7.0
s.add_runtime_dependency 'unicorn'
s.add_runtime_dependency 'rdf-n3'
end