Thomas Müller 32b29c9d73 Merge branch 'master' into fix-7307 ... Conflicts: core/js/router.js settings/js/admin.js		2014-03-06 00:15:08 +01:00
..
l10n	remove ru_RU - it has bee removed from transifex	2014-01-13 16:41:10 +01:00
private	Merge branch 'master' into fix-7307	2014-03-06 00:15:08 +01:00
public	fix path in sharing results if it is a file in the Shared folder	2014-02-25 17:27:23 +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 branch 'master' into fix-7307	2014-03-06 00:15:08 +01:00