Merge branch 'develop' into gun
authorMark Felder <feld@FreeBSD.org>
Tue, 18 Feb 2020 15:06:27 +0000 (09:06 -0600)
committerMark Felder <feld@FreeBSD.org>
Tue, 18 Feb 2020 15:06:27 +0000 (09:06 -0600)
commitcf943492878c901cf2f0056ee2a8814e0322e9d8
tree3ae91feb1a78eba87b627e216c035956bdba8853
parent514c899275a32e6ef63305f9424c50344d41b12e
parentcf8307e71c3f68bc26a540783a3ca26766b3b56c
Merge branch 'develop' into gun
docs/API/admin_api.md
lib/pleroma/config/transfer_task.ex
lib/pleroma/web/rel_me.ex
lib/pleroma/web/rich_media/parser.ex
mix.exs
mix.lock
test/web/admin_api/admin_api_controller_test.exs