Johannes Starosta 6ecfe51d8b Fix merge conflict		2015-07-19 06:06:26 +02:00
..
registercontroller.php	Fix merge conflict	2015-07-19 06:06:26 +02:00
settingscontroller.php	Fix merge conflict	2015-07-19 06:06:26 +02:00