Merge branch 'develop' of https://github.com/friendica/friendica into develop
authorAdam Clark <adam+friendicadev@isurf.ca>
Thu, 20 Aug 2020 21:47:06 +0000 (14:47 -0700)
committerAdam Clark <adam+friendicadev@isurf.ca>
Thu, 20 Aug 2020 21:47:06 +0000 (14:47 -0700)
Today's upstream develop update.


Trivial merge