Merge branch 'task/server_env' of https://github.com/nupplaphil/friendica into task...
authorPhilipp <admin@philipp.info>
Tue, 6 Oct 2020 18:56:45 +0000 (20:56 +0200)
committerPhilipp <admin@philipp.info>
Tue, 6 Oct 2020 18:56:45 +0000 (20:56 +0200)

Trivial merge