From: Adam Clark <adam+friendicadev@isurf.ca>
Date: Thu, 20 Aug 2020 21:47:06 +0000 (-0700)
Subject: Merge branch 'develop' of https://github.com/friendica/friendica into develop
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=0388281e86eeaa4d557d7f04374e57893d542fac;p=friendica.git

Merge branch 'develop' of https://github.com/friendica/friendica into develop
Today's upstream develop update.
---

0388281e86eeaa4d557d7f04374e57893d542fac