summaryrefslogtreecommitdiffstats
path: root/apps/federatedfilesharing/lib/DiscoveryManager.php
Commit message (Collapse)AuthorAgeFilesLines
* Fix apps/Joas Schilling2016-07-211-1/+5
|
* Merge remote-tracking branch 'upstream/master' into master-upstream-syncLukas Reschke2016-06-261-1/+4
|\
| * Increase fed share timeout from 3 to 10 + unit testsVincent Petry2016-06-221-2/+2
| |
| * Add timeouts to make the UI usable again when a remote share is unreachableJoas Schilling2016-06-221-1/+4
| |
* | s/ownCloud/NextcloudBjoern Schiessle2016-06-201-1/+1
|/
* Update license headersLukas Reschke2016-05-261-1/+1
|
* Move FederatedFileSharing to PSR-4Joas Schilling2016-05-181-0/+136