Merge
authorMichael <heluecht@pirati.ca>
Tue, 28 Apr 2020 13:33:03 +0000 (13:33 +0000)
committerMichael <heluecht@pirati.ca>
Tue, 28 Apr 2020 13:33:03 +0000 (13:33 +0000)
commit70e5639e2973662705b44e643ac46ce68dd6dade
treea6ef42dd28df4f11df0307cd009c875a01666315
parentc2a9b3b9e95260a73c82704620e59f2a08114911
Merge
17 files changed:
mod/msearch.php
src/Core/Worker.php
src/Database/Database.php
src/Model/Contact.php
src/Model/GContact.php
src/Model/Process.php
src/Model/Search.php
src/Model/User.php
src/Model/UserItem.php
src/Module/Admin/DBSync.php
src/Module/Admin/Site.php
src/Module/Settings/Delegation.php
src/Protocol/ActivityPub/Transmitter.php
src/Protocol/Diaspora.php
src/Worker/CronJobs.php
src/Worker/UpdateGContacts.php
src/Worker/UpdateGServers.php