Fakturama2: develop 007facd3

Diff Back to Repository
Author Committer Branch Timestamp Parent
Ralf Heydenreich develop 2019-06-08 15:57 Pending
Changeset

Merge remote-tracking branch 'origin/develop' into
feature/FAK-737_update_3rd_party_libs

Conflicts:
Fakturama-Parent/com.sebulli.fakturama.common/META-INF/MANIFEST.MF
Fakturama-Parent/com.sebulli.fakturama.rcp/META-INF/MANIFEST.MF