diff options
| author | Christoph Helma <helma@in-silico.ch> | 2012-08-20 12:51:10 +0200 |
|---|---|---|
| committer | Christoph Helma <helma@in-silico.ch> | 2012-08-20 12:51:10 +0200 |
| commit | 990043fd2c3b8456c75ed5040d5380bc03be9aef (patch) | |
| tree | c36d0ba8a6673b9953316f97de76418102f58f9e | |
| parent | c1b22b7f77436fab48749e9ddc5de29cef2de7fc (diff) | |
| parent | 673ce3000b81060d33bba38996103a54ad4795b9 (diff) | |
Merge branch 'development' into feature/opentox-client
Conflicts:
application.rb
| -rw-r--r-- | ChangeLog | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog new file mode 100644 index 0000000..761104f --- /dev/null +++ b/ChangeLog @@ -0,0 +1,2 @@ +2012-07-12 + * switch to opentox-ruby version 4.0.0 |