diff options
| author | Christoph Helma <helma@in-silico.ch> | 2013-05-29 15:12:52 +0200 |
|---|---|---|
| committer | Christoph Helma <helma@in-silico.ch> | 2013-05-29 15:12:52 +0200 |
| commit | f2ef6216ef785656d799c880f22013f6c7e900e7 (patch) | |
| tree | fa7d72d434c9cb70483222aa4bc7f580e0bd8fa9 /lib/policy.rb | |
| parent | 0f770837cbfe17fe17fc86aa0d360c55e281c7f7 (diff) | |
| parent | ef122484598a8979de915344cdeff475cff752c5 (diff) | |
Merge branch 'development' of github.com:opentox/opentox-client into development
Conflicts:
lib/compound.rb
Diffstat (limited to 'lib/policy.rb')
0 files changed, 0 insertions, 0 deletions