Sebastian Grewe 6522fb2747 fixing merge conflicts		2013-08-22 11:54:17 +02:00
..
admin_settings.inc.php	moved motd to website tab	2013-08-20 12:08:59 +02:00
global.inc.dist.php	fixing merge conflicts	2013-08-22 11:54:17 +02:00