Thomas Müller 3a6b11d018 Merge pull request #13767 from owncloud/issue/13764-mimetype-racecondition ... Use insertIfNotExists() and reload mimetypes after inserting one		2015-02-20 17:39:17 +01:00
..
l10n	[tx-robot] updated from transifex	2015-02-20 01:55:01 -05:00
private	Merge pull request #13767 from owncloud/issue/13764-mimetype-racecondition	2015-02-20 17:39:17 +01:00
public	Merge pull request #13989 from owncloud/enhancment/security/11857	2015-02-18 10:27:29 -05:00
repair	Merge pull request #13861 from owncloud/remove-disabled-files-repair-step	2015-02-10 22:46:53 +01:00
autoloader.php	use Composer autoloader not OC for non-Composer 3rdparty (#9643)	2014-10-28 11:32:20 +01:00
base.php	Merge pull request #14199 from owncloud/cast-type-manually	2015-02-19 17:19:54 +01:00