server/admin
François KUBLER 7faf852561 Merge branch 'refactoring' of git.kde.org:owncloud into refactoring
Conflicts:
	admin/templates/index.php
	templates/layout.admin.php
	templates/layout.user.php

All conflicts are fixed.
2011-03-09 22:46:17 +01:00
..
appinfo Base for a more flexible navigation 2011-03-03 23:08:11 +01:00
img Base for a more flexible navigation 2011-03-03 23:08:11 +01:00
templates Merge branch 'refactoring' of git.kde.org:owncloud into refactoring 2011-03-09 22:46:17 +01:00
index.php Base for a more flexible navigation 2011-03-03 23:08:11 +01:00
plugins.php Forgot to change some calls of linkTo 2011-03-02 23:58:46 +01:00
system.php Forgot to change some calls of linkTo 2011-03-02 23:58:46 +01:00
users.php Forgot to change some calls of linkTo 2011-03-02 23:58:46 +01:00