Lukas Reschke 34fb313466 Merge pull request #2689 from andreas-p/fix-remote-conflict ... Fix showConflict		2016-12-19 14:34:56 +07:00
..
ajax	Merge pull request #1883 from nextcloud/downstream-26145	2016-10-25 13:19:46 +07:00
appinfo	Update app versions and requirements	2016-12-13 20:41:55 +07:00
css	Fix popover margin and width	2016-12-07 10:50:54 +07:00
img	Provider for the files app	2016-11-16 09:25:45 +07:00
js	Fix showConflict	2016-12-19 08:11:04 +07:00
l10n	[tx-robot] updated from transifex	2016-12-12 01:07:18 +07:00
lib	Remove leading slash from sharing activity	2016-12-15 15:53:48 +07:00
templates	Merge pull request #1978 from nextcloud/remove-send-mail-option	2016-11-02 22:36:05 +07:00
tests	Add tests for favorite action	2016-12-04 12:54:34 +07:00
download.php	…
list.php	Remove upload_limit in files app as it is not needed with PUT upload (#26069)	2016-11-02 20:43:35 +07:00
recentlist.php	…
simplelist.php	…