Morris Jobke ba16fd0d33 Merge branch 'master' into sync-master		2016-07-07 11:29:46 +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	Revert "[tx-robot] updated from transifex"	2016-07-07 11:04:08 +02:00
lib	Merge branch 'master' into sync-master	2016-07-07 11:29:46 +02:00
templates	s/ownCloud/Nextcloud	2016-06-20 14:20:48 +02:00
tests	Handle exceptions thrown while trying to notify remote server of a fed share	2016-06-27 14:28:12 +02:00
settings-admin.php	Add app:check-code for already compatible apps	2016-06-27 16:50:10 +02:00
settings-personal.php	s/ownCloud/Nextcloud	2016-06-20 14:20:48 +02:00