Thomas Mueller afb5de955e Merge branch 'master' into fixing-998-master ... Conflicts: apps/files/ajax/upload.php apps/files/js/files.js		2013-01-18 23:22:34 +01:00
..
admin.php	Spaces to tabs	2013-01-16 18:09:16 +01:00
apps.php	Spaces to tabs	2013-01-16 18:09:16 +01:00
help.php	Spaces to tabs	2013-01-16 18:09:16 +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	Spaces to tabs	2013-01-16 18:09:16 +01:00
settings.php	More style fixes	2012-12-15 00:43:46 +01:00
users.php	Merge branch 'master' into fixing-998-master	2013-01-18 23:22:34 +01:00