Merge branch 'hotfix/5.18.1' 5.18.1
authorroot <root@edit-integration.bgbm.fu-berlin.de>
Thu, 17 Dec 2020 14:50:21 +0000 (15:50 +0100)
committerroot <root@edit-integration.bgbm.fu-berlin.de>
Thu, 17 Dec 2020 14:50:21 +0000 (15:50 +0100)
commit5b06a01376c400d19caef3de7cd150eff17f17d1
treec59a47f0daf8fa70c16c65eae4be69ab8fc00dd9
parent2190c91b8c2f9b35cf3074e105150fd657b89a5b
parent2cb343b3dc6a94787980ff60fd65d52ab60afe83
Merge branch 'hotfix/5.18.1'
eu.etaxonomy.taxeditor.local/META-INF/MANIFEST.MF