Merge branch 'develop' into detailsE4
authorPatrick Plitzner <p.plitzner@bgbm.org>
Thu, 10 Aug 2017 14:36:17 +0000 (16:36 +0200)
committerPatrick Plitzner <p.plitzner@bgbm.org>
Thu, 10 Aug 2017 14:36:17 +0000 (16:36 +0200)
commit1919a29db6cc2f716103097cba4fefa75949cdb6
treeb75c36de48afd553f8d7210f7ab0d905867fbf5c
parent9c4df5f56d69a2ffe0d87ef20b92330eed3c171b
parent61650dda13a1431d0d3597f9e1802b07281f483c
Merge branch 'develop' into detailsE4