Merge branch 'develop' into wset
authorPatrick Plitzner <p.plitzner@bgbm.org>
Tue, 16 Jan 2018 12:14:56 +0000 (13:14 +0100)
committerPatrick Plitzner <p.plitzner@bgbm.org>
Tue, 16 Jan 2018 12:14:56 +0000 (13:14 +0100)
commit56d00492ba8a081ce3e6594f636a6d79f82bf518
tree35dc04a53c09bb4a86364b9d0183d496bc23c119
parent7af3e5a693b34754bdb50305cdf1b072b571724f
parent692d6943700d9caa01d523b5fccf110829b8020a
Merge branch 'develop' into wset