kondou 0ce35af02a Merge branch 'master' into improve_app-management ... Conflicts: settings/js/apps.js		2013-08-21 19:20:25 +02:00
..
admin.php	remove table layout for background jobs	2013-07-31 10:04:02 +02:00
apps.php	Move .errormsg from settings-css to .warning in core. Reusable!	2013-08-18 17:37:22 +02:00
help.php	Merge branch 'master' into fixing-bugtracker-link-master	2013-03-01 23:41:23 +01:00
oauth-required-apps.php	[core] From echo to p	2013-02-27 22:55:39 +01:00
personal.php	Merge branch 'master' into decrypt_files_again	2013-08-17 13:15:22 +02:00
settings.php	[core] From echo to p	2013-02-27 22:55:39 +01:00
users.php	Use JSON to send/receive group data.	2013-08-15 06:19:40 -04:00