Merge branch 'develop' into termSearch
authorPatrick Plitzner <p.plitzner@bgbm.org>
Tue, 19 Feb 2019 15:34:21 +0000 (16:34 +0100)
committerPatrick Plitzner <p.plitzner@bgbm.org>
Tue, 19 Feb 2019 15:34:21 +0000 (16:34 +0100)
commit533b4c799915cc65b190af0405f0f2311fc693d9
tree6ab13b8d9ee26099686a390f8b9923143e82d21a
parentbf45901f4368554a886908577723e4cbc4fe4a4c
parent070e631751a52df03a99da36cd770dfea2b47fcb
Merge branch 'develop' into termSearch