Thomas Müller f19276f7bc Merge branch 'master' into no-css-js-delivery-via-php ... Conflicts: config/config.sample.php		2014-02-21 09:51:51 +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 no-css-js-delivery-via-php	2014-02-21 09:51:51 +01:00
public	Merge pull request #6714 from owncloud/files-newfileinvalidcharsfix	2014-02-20 11:53:58 +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	kill $coreStyles and $coreScripts	2014-02-20 14:18:01 +01:00