7 commits

Author	SHA1	Message	Date
Joas Schilling	813f0a0f40	Fix apps/	2016-07-21 18:13:57 +02:00
Lukas Reschke	7a9d60d87e	Merge remote-tracking branch 'upstream/master' into master-upstream-sync	2016-06-26 12:55:05 +02:00
Vincent Petry	ec968a48e4	Increase fed share timeout from 3 to 10 + unit tests	2016-06-22 10:29:40 +02:00
Joas Schilling	3e763ac81e	Add timeouts to make the UI usable again when a remote share is unreachable	2016-06-22 10:29:40 +02:00
Bjoern Schiessle	9eaccaf2b1	s/ownCloud/Nextcloud	2016-06-20 14:20:48 +02:00
Lukas Reschke	aba539703c	Update license headers	2016-05-26 19:57:24 +02:00
Joas Schilling	8dc25321d3	Move FederatedFileSharing to PSR-4	2016-05-18 15:28:50 +02:00

Renamed from apps/federatedfilesharing/lib/discoverymanager.php (Browse further)