raghunayyar 9ba4a76214 resolving conflict when picking 8b81a0b		2014-06-02 12:53:52 +02:00
..
users	resolving conflict when picking 8b81a0b	2014-06-02 12:53:52 +02:00
admin.php	Merge pull request #7614 from owncloud/test_annotations_working	2014-05-30 22:17: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