Merge branch 'develop' into nameEditorE4
authorPatrick Plitzner <p.plitzner@bgbm.org>
Thu, 31 Aug 2017 11:07:27 +0000 (13:07 +0200)
committerPatrick Plitzner <p.plitzner@bgbm.org>
Thu, 31 Aug 2017 11:07:27 +0000 (13:07 +0200)
commit8440830883755979f839dcd3c11abd3a96c40341
treefb68fccc4dd7d164489164a2d22aa1893eaee578
parentb9a45989d529e8913d60371baad0b097b1572c18
parentaf969685c98d7f521384f5735da697ccdae67dbe
Merge branch 'develop' into nameEditorE4