diff options
| author | Christoph Helma <ch@toxbank-ch.in-silico.ch> | 2012-02-15 17:20:24 +0000 |
|---|---|---|
| committer | Christoph Helma <ch@toxbank-ch.in-silico.ch> | 2012-02-15 17:20:24 +0000 |
| commit | 7ba9df992e8a0db4f3ff79754e48118e7dba1e0b (patch) | |
| tree | c9bd8ec8d29e8662231266741e405b306108318d /Gemfile | |
| parent | 76e2c84c766fd37d702c45e76dc666230afcd136 (diff) | |
| parent | 9ed209b262e0b540af967e24e9b9845600a0669c (diff) | |
Merge branch 'development' of github.com:opentox/opentox-client into development
Conflicts:
lib/spork.rb
lib/task.rb
Diffstat (limited to 'Gemfile')
0 files changed, 0 insertions, 0 deletions