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.js	Add security section to admin menu	2013-01-11 14:18:51 +01:00
apps.js	Move and fix app setting navigation detect	2012-10-29 15:04:55 +01:00
log.js	hide morelog button if there are no more log entries - bugfix for oc-1398	2012-08-04 17:38:31 +02:00
personal.js	Add missing ; to js code	2012-09-05 22:26:09 +02:00
users.js	Merge branch 'master' into fixing-998-master	2013-01-18 23:22:34 +01:00