diff options
| author | Christoph Helma <helma@in-silico.ch> | 2012-08-23 08:43:38 +0200 |
|---|---|---|
| committer | Christoph Helma <helma@in-silico.ch> | 2012-08-23 08:43:38 +0200 |
| commit | 381fe97fa5a27476070408118a4ecb000c3cb339 (patch) | |
| tree | 22c161d5c7987a941d9015e70e07319b77bf7c98 /application.rb | |
| parent | f3a8a30391eaa832d3c2d0b0fba298a35678be83 (diff) | |
| parent | 068fe693a0ecd0aba769b20a0def1ac048ee45a1 (diff) | |
Merge branch 'development' of github.com:opentox/compound into developmentv5.0.0pre1
Conflicts:
compound.gemspec
Diffstat (limited to 'application.rb')
0 files changed, 0 insertions, 0 deletions