Merge branch 'develop' into nameEditorE4
authorPatrick Plitzner <p.plitzner@bgbm.org>
Tue, 29 Aug 2017 05:41:12 +0000 (07:41 +0200)
committerPatrick Plitzner <p.plitzner@bgbm.org>
Tue, 29 Aug 2017 05:41:12 +0000 (07:41 +0200)
commitb1a220bc2eafa0301a2201131f9b9d0750cc7aa9
treefb38b21426a93591ca6e4c774ee2829895bd01da
parentb692de7015cf4bb88c17bd0759ec0fa8b9ecf88f
parent2f0030fa030d6d604a5ff7d7519bcf6cd39735a2
Merge branch 'develop' into nameEditorE4