Jana Deutschländer 446069796c Merge branch 'master' into 'userTasksOverlay' ... # Conflicts: # css/area_nav-usertools.less		2017-04-25 16:26:02 +02:00
..
lang.php	Merge branch 'master' into 'userTasksOverlay'	2017-04-25 16:26:02 +02:00
settings.php	Merge remote-tracking branch 'origin/detailView'	2017-04-19 15:44:01 +02:00