Bart Visscher 6b061c236d Merge branch 'master' into type-hinting ... Conflicts: lib/private/image.php lib/private/l10n.php lib/private/request.php lib/private/share/mailnotifications.php lib/private/template/base.php		2014-03-31 21:38:54 +02:00
..
l10n	[tx-robot] updated from transifex	2014-03-26 01:56:21 -04:00
private	Merge branch 'master' into type-hinting	2014-03-31 21:38:54 +02:00
public	Merge branch 'master' into type-hinting	2014-03-31 21:38:54 +02: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