Georg Ehrke 0fe8f77c17 Merge branch 'master' into update_shipped_apps_from_appstore ... Conflicts: lib/private/app.php settings/templates/apps.php		2014-06-05 22:54:27 +02:00
..
users	fix grouplist behaviour (blank after filtering)	2014-06-02 17:32:59 +02:00
admin.js	Merge pull request #8784 from owncloud/fold-reshare-settings	2014-06-02 14:37:10 +02:00
apps-custom.php	Use JS as content-type due to mimesniffing	2014-04-17 10:40:19 +02:00
apps.js	Merge branch 'master' into update_shipped_apps_from_appstore	2014-06-05 22:54:27 +02:00
log.js	Fix some JSLint warnings	2013-07-31 21:21:02 +02:00
personal.js	remove obsolete placeholder call, fix #8881	2014-06-04 18:44:12 +02:00