| commit | 62343e3030cd5fa032a5535e9cf0ed850265e538 | [log] [tgz] |
|---|---|---|
| author | Matthias Koller <m.koller@peak-solution.de> | Mon Oct 07 09:13:11 2019 +0200 |
| committer | Matthias Koller <m.koller@peak-solution.de> | Mon Oct 07 09:13:11 2019 +0200 |
| tree | 553c280928664948f4b006fef1c65e2456473ff3 | |
| parent | 458d98c0a6ad0baaf8def653e354d726f1edeafa [diff] | |
| parent | 0d66f3406454af5c3b515f003702f2ee5bef13e5 [diff] |
Merge branch 'dev' into mkoller/atfxadapter Conflicts: build.gradle Signed-off-by: Matthias Koller <m.koller@peak-solution.de>
diff --git a/build.gradle b/build.gradle index ad9d310..e67b14e 100644 --- a/build.gradle +++ b/build.gradle
@@ -14,7 +14,7 @@ description = 'MDM API - ODSAdapter' group = 'org.eclipse.mdm' -version = '5.1.0M5-ATFX-SNAPSHOT' +version = '5.1.0M6-ATFX-SNAPSHOT' apply plugin: 'java' apply plugin: 'maven'