Lukas Reschke 6670d37658 Merge remote-tracking branch 'upstream/master' into master-sync-upstream		2016-06-27 18:23:00 +02:00
..
appinfo	s/ownCloud/Nextcloud	2016-06-20 14:20:48 +02:00
css	move federated sharing settings to the federatedfilesharing app	2016-04-22 14:55:40 +02:00
img	move federated sharing settings to the federatedfilesharing app	2016-04-22 14:55:40 +02:00
js	move federated sharing settings to the federatedfilesharing app	2016-04-22 14:55:40 +02:00
l10n	Merge remote-tracking branch 'upstream/master' into master-upstream-sync	2016-06-26 12:55:05 +02:00
lib	Merge remote-tracking branch 'upstream/master' into master-sync-upstream	2016-06-27 18:23:00 +02:00
templates	s/ownCloud/Nextcloud	2016-06-20 14:20:48 +02:00
tests	Increase fed share timeout from 3 to 10 + unit tests	2016-06-22 10:29:40 +02:00
settings-admin.php	Update license headers	2016-05-26 19:57:24 +02:00
settings-personal.php	s/ownCloud/Nextcloud	2016-06-20 14:20:48 +02:00