summaryrefslogtreecommitdiff
path: root/lib/opentox-client.rb
diff options
context:
space:
mode:
authorrautenberg <rautenberg@in-silico.ch>2012-03-21 09:32:18 +0100
committerrautenberg <rautenberg@in-silico.ch>2012-03-21 09:32:18 +0100
commit8013002d2256a2e86982c2d0ef8358ad30bc9252 (patch)
tree6e25e5d92ca29cd46213d593db14d5538630d5e1 /lib/opentox-client.rb
parenta6d1725caa7d350f2526ea82af3478a12a34f93d (diff)
parentfc990e6dae8af7cfdf7d12b4e1d9ccd3b557418a (diff)
Merge branch 'development' of github.com:opentox/opentox-client into development
Diffstat (limited to 'lib/opentox-client.rb')
-rw-r--r--lib/opentox-client.rb2
1 files changed, 2 insertions, 0 deletions
diff --git a/lib/opentox-client.rb b/lib/opentox-client.rb
index 8616995..dec3512 100644
--- a/lib/opentox-client.rb
+++ b/lib/opentox-client.rb
@@ -26,6 +26,8 @@ FALSE_REGEXP = /^(false|inactive|0|0.0|low tox|deactivating|non-carcinogen|non-m
require File.join(File.dirname(__FILE__),"overwrite.rb")
require File.join(File.dirname(__FILE__),"error.rb")
require File.join(File.dirname(__FILE__),"rest-client-wrapper.rb")
+require File.join(File.dirname(__FILE__),"authorization.rb")
+require File.join(File.dirname(__FILE__),"policy.rb")
require File.join(File.dirname(__FILE__),"otlogger.rb") # avoid require conflicts with logger
require File.join(File.dirname(__FILE__),"opentox.rb")
require File.join(File.dirname(__FILE__),"task.rb")