Johannes Starosta 5b9f0f0286 Fix merge conflict		2015-08-01 10:19:58 +02:00
..
registercontroller.php	Fix merge conflict	2015-08-01 10:19:58 +02:00
settingscontroller.php	Removed unneeded imports and outcommented lines	2015-07-19 06:11:07 +02:00