sherbrecher ec45a8433d Merge remote-tracking branch 'upstream/master' ... Conflicts: apps/files_external/templates/settings.php		2013-03-15 17:50:02 +01:00
..
files	[tx-robot] updated from transifex	2013-03-15 00:06:36 +01:00
files_encryption	[tx-robot] updated from transifex	2013-03-15 00:06:36 +01:00
files_external	Merge remote-tracking branch 'upstream/master'	2013-03-15 17:50:02 +01:00
files_sharing	[tx-robot] updated from transifex	2013-03-14 00:06:29 +01:00
files_trashbin	Merge pull request #2336 from eMerzh/fix_trashpg	2013-03-15 03:17:54 -07:00
files_versions	remove backticks around table names	2013-03-15 12:10:21 +01:00
user_ldap	[tx-robot] updated from transifex	2013-03-15 00:06:36 +01:00
user_webdavauth	[tx-robot] updated from transifex	2013-03-10 00:06:53 +01:00