Merge branch 'develop' into nameEditorE4
authorPatrick Plitzner <p.plitzner@bgbm.org>
Thu, 31 Aug 2017 12:17:43 +0000 (14:17 +0200)
committerPatrick Plitzner <p.plitzner@bgbm.org>
Thu, 31 Aug 2017 12:17:43 +0000 (14:17 +0200)
commit0819c19db63cc608e26f924eb554e61f4d0638bd
treea633721ae2ba4aaa48f445c4e25221734887d025
parentee958820bf1f25a1951894c5e50f2f2ee297d26c
parent9091311f03b04380d95a768749614ec5a59f2d4a
Merge branch 'develop' into nameEditorE4