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
..
files	Merge branch 'master' into fix-7307	2014-03-06 00:15:08 +01:00
files_encryption	don't create files folder, let ownCloud core handle it	2014-03-05 12:44:02 +01:00
files_external	Merge pull request #7354 from pschmitt/master	2014-03-05 19:25:09 +01:00
files_sharing	Merge branch 'master' into fix-7307	2014-03-06 00:15:08 +01:00
files_trashbin	Fixed trashbin title	2014-02-20 15:16:45 +01:00
files_versions	Scrutinizer Auto-Fixes	2014-02-19 09:31:54 +01:00
user_ldap	Fixed configkey casing for PostgreSQL	2014-03-03 16:15:23 +01:00
user_webdavauth	[tx-robot] updated from transifex	2014-01-04 01:55:57 -05:00