Thomas Mueller b1da1db0eb Merge branch 'master' into from_live_to_on ... Conflicts: apps/files_external/js/google.js		2013-01-31 23:34:12 +01:00
..
admin.js	Add security section to admin menu	2013-01-11 14:18:51 +01:00
apps-custom.php	Move appid to external file	2013-01-23 11:21:34 +01:00
apps.js	update on translation string	2013-01-31 14:11:31 +01:00
isadmin.php	Move isadmin to external file	2013-01-21 21:25:38 +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	use on instead of live in users.js	2013-01-30 17:49:02 +01:00