Merge branch 'master' into develop
authorKatja Luther <k.luther@bgbm.org>
Tue, 24 Sep 2019 08:55:11 +0000 (10:55 +0200)
committerKatja Luther <k.luther@bgbm.org>
Tue, 24 Sep 2019 08:55:11 +0000 (10:55 +0200)
commit420b21d75a87b80b2c77877c9ff7f3a5477b8284
tree9713d9915ee725436290965e7d1b619be67da441
parent517899dab7f3c1460ba85e0605ade1b392ca2da3
parent092b48dad952cc328b362962424a36aa40b714de
Merge branch 'master' into develop