Jana Deutschländer d3e6e376f1 Merge branch 'master' into 'spis-master' ... # Conflicts: # lang/en/lang.php		2017-04-26 16:42:17 +02:00
..
lang.php	Merge branch 'master' into 'spis-master'	2017-04-26 16:42:17 +02:00
settings.php	Merge remote-tracking branch 'origin/detailView'	2017-04-19 15:44:01 +02:00