Thomas Müller 617dc0e468 Merge branch 'master' into moviepreviewfallback ... Conflicts: lib/private/preview/movies.php		2013-11-14 20:57:29 +01:00
..
l10n	[tx-robot] updated from transifex	2013-11-09 01:45:32 -05:00
private	Merge branch 'master' into moviepreviewfallback	2013-11-14 20:57:29 +01:00
public	Fix fatal error when trying to open a non existing public link	2013-11-12 15:38:00 +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	add trash bin and file versions delete hooks in OC::registerPreviewHooks	2013-11-12 14:08:55 +01:00