server/admin/templates
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
..
index.php Merge branch 'refactoring' of git.kde.org:owncloud into refactoring 2011-03-09 22:46:17 +01:00
plugins.php Fixed PHP syntax in template files. 2011-03-09 21:57:00 +01:00
system.php Getting rid of Smarty, using our own template system 2011-03-02 11:56:48 +01:00
users.php Fixed PHP syntax in template files. 2011-03-09 21:57:00 +01:00