| commit | ca97968b5652bddb8ff8e269e6c15407c1cf27e1 | [log] [tgz] |
|---|---|---|
| author | Matthias Koller <m.koller@peak-solution.de> | Tue Aug 13 11:49:59 2019 +0200 |
| committer | Matthias Koller <m.koller@peak-solution.de> | Tue Aug 13 11:49:59 2019 +0200 |
| tree | 7e8489e48f26382bc2fb795a79062fbc542e4379 | |
| parent | a00264f0b6cc4ee5fbecf287627dd75f93c837e8 [diff] | |
| parent | 86bcd73b81574162229f85220de8252e4454c98b [diff] |
Merge branch 'dev' into mkoller/atfxadapter Conflicts: build.gradle Signed-off-by: Matthias Koller <m.koller@peak-solution.de>