Thomas Müller 30f1ec2521 Merge branch 'master' into test_annotations_working ... Conflicts: lib/private/util.php		2014-05-19 21:42:30 +02:00
..
admin.php	Merge branch 'master' into test_annotations_working	2014-05-19 21:42:30 +02:00
apps.php	Makes #app-navigation a part of app management.	2014-03-20 13:34:50 +05:30
help.php	Merge branch 'master' into fixing-bugtracker-link-master	2013-03-01 23:41:23 +01: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
users.php	Move isadmin to template and rename it to oc_isadmin	2014-02-19 17:56:12 +01:00