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
..
lang.php	Merge branch 'master' of gitlab.cosmocode.de:deutschlaender/sprintdoc-template into spis-master	2017-04-26 09:37:42 +02:00
settings.php	Merge remote-tracking branch 'origin/detailView'	2017-04-19 15:44:01 +02:00
style.txt	initial commit starter template	2016-10-31 11:48:20 +01:00