diff options
| author | gebele <gebele@in-silico.ch> | 2017-05-04 11:40:23 +0000 |
|---|---|---|
| committer | gebele <gebele@in-silico.ch> | 2017-05-04 11:40:23 +0000 |
| commit | 2a0bd70da4d2bee9df7580bec5136b4a5e395562 (patch) | |
| tree | aec19bd9dad554080c62c1f6317a4d637d3781b9 /VERSION | |
| parent | b2fbc50c5d11c7abb720c39b0fa35d0855bcee69 (diff) | |
| parent | 1cf0938be3cc81e426030df9b1a1e3f534fa5fc2 (diff) | |
fixed merge from master
Diffstat (limited to 'VERSION')
| -rw-r--r-- | VERSION | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -1 +1 @@ -1.1.1 +1.2.0 |