Thomas Müller 5e397d89c4 Merge branch 'master' into fixing-4546-master ... Conflicts: lib/private/connector/sabre/directory.php		2013-10-07 17:47:54 +02:00
..
l10n	move l10n factory into private	2013-10-07 10:00:23 +02:00
private	Merge branch 'master' into fixing-4546-master	2013-10-07 17:47:54 +02:00
public	Merge pull request #5072 from owncloud/apache-auth-master	2013-10-07 06:29:56 -07:00
apphelper.php	Add Helper and URLGenerator interfaces to server container	2013-10-04 18:11:02 +02:00
autoloader.php	Merge pull request #5071 from owncloud/fix-autoloader-master	2013-10-02 03:10:10 -07:00
base.php	fixing various PHPDoc comments	2013-10-02 15:04:42 +02:00
urlgenerator.php	Add Helper and URLGenerator interfaces to server container	2013-10-04 18:11:02 +02:00