Jana Deutschländer 7b09296348 Merge remote-tracking branch 'origin/detailView' ... # Conflicts: # lang/de/settings.php # lang/en/settings.php		2017-04-19 15:44:01 +02:00
..
lang.php	SPR-814: detail template	2017-04-19 15:21:55 +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