| commit | 33150215724807bd690605e0a43b76976d11b711 | [log] [tgz] |
|---|---|---|
| author | Akron <nils@diewald-online.de> | Mon Oct 24 20:26:58 2016 +0200 |
| committer | Gerrit Code Review <gerrit2@korap.ids-mannheim.de> | Mon Oct 24 20:26:58 2016 +0200 |
| tree | 866a5c928b96dd2c6203df991b8dbcef5d7b419c | |
| parent | 345faf3a25e38fa84102dfe8b09cee810557abcd [diff] | |
| parent | ad4cb0167ecc0861f74282aa9902e1b68ecea999 [diff] |
Merge changes Ifdcfb816,I51994658 * changes: Fixed conflict Fixed rootdir in meta parser