Morris Jobke 6b3975c23a Merge pull request #6846 from nextcloud/filelist-confict-path ... still trigger conflict resolution for existing entries when the curre…		2017-11-09 09:33:59 +01:00
..
ajax	Update license headers	2017-11-06 16:56:19 +01:00
appinfo	Update license headers	2017-11-06 16:56:19 +01:00
composer	Files Autoloader	2017-10-24 20:40:12 +02:00
css	Reduce spread of css selector for a.action	2017-11-07 16:32:20 +01:00
img	Quota icon by @jancborchardt	2017-09-21 14:00:38 +02:00
js	Merge pull request #6846 from nextcloud/filelist-confict-path	2017-11-09 09:33:59 +01:00
l10n	[tx-robot] updated from transifex	2017-11-09 01:09:13 +00:00
lib	Merge pull request #7075 from nextcloud/remove-unused-variables	2017-11-07 16:18:40 +01:00
templates	Merge pull request #6788 from staabm/master	2017-11-08 18:55:35 +01:00
tests	Update license headers	2017-11-06 16:56:19 +01:00
download.php	Update with robin	2016-07-21 18:13:58 +02:00
list.php	Remove upload_limit in files app as it is not needed with PUT upload (#26069)	2016-11-02 20:43:35 +01:00
recentlist.php	Change @georgehrke's email	2017-11-06 20:38:59 +01:00
simplelist.php	Fix apps/	2016-07-21 18:13:57 +02:00