Thomas Müller 7086c386fd Merge branch 'master' into append-error-document ... Conflicts: lib/private/setup.php lib/private/updater.php		2014-04-02 08:48:37 +02:00
..
l10n	[tx-robot] updated from transifex	2014-04-02 01:56:39 -04:00
private	Merge branch 'master' into append-error-document	2014-04-02 08:48:37 +02:00
public	Merge pull request #7879 from owncloud/sharing_cleanup_public_api	2014-03-28 12:23:11 +01:00
autoloader.php	Allow null as cache parameter (if no cache was found) and for cache removal.	2013-10-22 11:17:15 +02:00
base.php	Merge pull request #7879 from owncloud/sharing_cleanup_public_api	2014-03-28 12:23:11 +01:00