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 related layout issues in user management	2014-06-04 16:24:39 +02:00
admin.php	Merge pull request #8840 from owncloud/share_settings	2014-06-03 16:42:44 +02:00
apps.php	Merge branch 'master' into update_shipped_apps_from_appstore	2014-06-05 22:54:27 +02:00
help.php	add arrow icon for external links	2014-06-02 23:18:25 +02:00
personal.php	Added app navigation for files app	2014-05-15 17:51:04 +02:00
settings.php	[core] From echo to p	2013-02-27 22:55:39 +01:00