Thomas Mueller 5788d36c8d Merge branch 'master' into fixing-1354-master ... Conflicts: settings/admin.php settings/templates/admin.php		2013-02-07 10:44:28 +01:00
..
admin.php	Merge branch 'master' into fixing-1354-master	2013-02-07 10:44:28 +01:00
apps.php	Add 'hascontrols' class for content with fixed topbar.	2013-02-04 18:30:49 +01:00
help.php	Remove uneeded JS	2013-01-22 12:15:46 +01:00
oauth-required-apps.php	Check if required apps are installed	2012-07-30 16:41:07 +00:00
oauth.php	Check if required apps are installed	2012-07-30 16:41:07 +00:00
personal.php	make it possible to modify the links to the clients	2013-02-06 15:20:43 +01:00
settings.php	More style fixes	2012-12-15 00:43:46 +01:00
users.php	Add 'hascontrols' class for content with fixed topbar.	2013-02-04 18:30:49 +01:00