Commit graph

3 commits

Author SHA1 Message Date
Silke Pisulla
fabd75acdf Merge branch 'master' of gitlab.cosmocode.de:deutschlaender/sprintdoc-template into spis-master
# Conflicts:
#	lang/de/lang.php
2017-04-26 09:37:42 +02:00
Silke Pisulla
63bb23ddb6 SPR-742: configure configmanager 2017-04-26 09:20:14 +02:00
Silke Pisulla
8644ba9a98 SPR-908: QS - config manager 2017-04-07 13:42:00 +02:00