Frank Karlitschek 66cab77b6d merge master ... Merge branch 'master' into improved_appsmanagement Conflicts: settings/apps.php settings/templates/apps.php		2013-01-30 14:36:17 +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	we are getting closer. updating is not working yet.	2013-01-21 20:40:23 +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	Merge pull request #1360 from owncloud/display_name	2013-01-29 14:05:54 -08:00