| commit | e6db0405afaf81ed70c429469f99381ae974d4a3 | [log] [tgz] |
|---|---|---|
| author | Matthias Koller <m.koller@peak-solution.de> | Mon Oct 07 09:12:06 2019 +0200 |
| committer | Matthias Koller <m.koller@peak-solution.de> | Mon Oct 07 09:12:06 2019 +0200 |
| tree | a373a1fb9e01fa76419918cbc077e11ccd8a4c64 | |
| parent | ca97968b5652bddb8ff8e269e6c15407c1cf27e1 [diff] | |
| parent | 7251987197d5043f4671698b5f59bb6b7e9d309c [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 38438bd..f2d9766 100644 --- a/build.gradle +++ b/build.gradle
@@ -15,7 +15,7 @@ description = 'MDM API - Base Model' group = 'org.eclipse.mdm' -version = '5.1.0M5-ATFX-SNAPSHOT' +version = '5.1.0M6-ATFX-SNAPSHOT' apply plugin: 'java' apply plugin: 'maven'