Merge branch 'develop' into wset
authorPatrick Plitzner <p.plitzner@bgbm.org>
Wed, 20 Dec 2017 09:26:22 +0000 (10:26 +0100)
committerPatrick Plitzner <p.plitzner@bgbm.org>
Wed, 20 Dec 2017 09:26:22 +0000 (10:26 +0100)
commitfbbdc507319d54f4d580805d990318d4167b0717
tree69bf92cb89d342109cb9511e235c9899e55358ce
parent7decf83de13de39749a7f28afef565ac9adcbf37
parent184336eb84b8b16bb1c6b4c05c916d235f9c9e98
Merge branch 'develop' into wset