Thomas Müller c6f4f85e27 Merge branch 'master' into scrutinizer_documentation_patches ... Conflicts: lib/private/migration/content.php		2014-02-18 18:31:33 +01:00
..
ajax	Merge pull request #6726 from owncloud/fix_6630	2014-02-14 14:34:20 +01:00
appinfo	increase size of mimetype column	2014-01-23 18:28:59 +01:00
css	make it possible to select folders	2013-12-02 16:30:03 +01:00
js	Fixed various file name escaping issues in core apps	2014-01-10 15:02:26 +01:00
l10n	remove ru_RU - it has bee removed from transifex	2014-01-13 16:41:10 +01:00
lib	Merge branch 'master' into scrutinizer_documentation_patches	2014-02-18 18:31:33 +01:00
templates	always show 'Deleted Files' breadcrumb	2013-12-13 12:17:10 +01:00
index.php	make it possible to select folders	2013-12-02 16:30:03 +01:00