Jörn Friedrich Dreyer 7bd5e89f8c simplify conflict template handling, fix reopen after ESC		2013-09-18 17:22:29 +02:00
..
files	simplify conflict template handling, fix reopen after ESC	2013-09-18 17:22:29 +02:00
files_encryption	Merge pull request #4708 from owncloud/encryption_fixes	2013-09-18 01:33:52 -07:00
files_external	Merge pull request #4719 from owncloud/port_4701_master	2013-09-12 15:44:20 -07:00
files_sharing	move upload dialog css to separate file	2013-09-18 17:20:14 +02:00
files_trashbin	Merge pull request #4501 from owncloud/ajaxfilelist	2013-09-14 12:51:16 -07:00
files_versions	[tx-robot] updated from transifex	2013-09-13 21:49:24 -04:00
user_ldap	[tx-robot] updated from transifex	2013-09-13 21:49:24 -04:00
user_webdavauth	[tx-robot] updated from transifex	2013-09-16 11:38:45 -04:00