diff options
| author | Christoph Helma <helma@in-silico.ch> | 2011-05-16 14:47:42 +0000 |
|---|---|---|
| committer | Christoph Helma <helma@in-silico.ch> | 2011-05-16 14:47:42 +0000 |
| commit | 243a1a6975543f12a6ea84eab5c4dda6c3d22d4a (patch) | |
| tree | 691d19fe532b7168a3d43f3e06111548258e87d4 /application.rb | |
| parent | b19f254428c46061a88dbe11b0298a48abf85648 (diff) | |
| parent | e9a1905129b84ce06925c08538b088697fbfa640 (diff) | |
Merge branch 'development' of github.com:opentox/toxcreate into development
Conflicts:
views/lazar.haml
Diffstat (limited to 'application.rb')
0 files changed, 0 insertions, 0 deletions