Merge branch 'develop' into gun
authorAlexander Strizhakov <alex.strizhakov@gmail.com>
Thu, 12 Mar 2020 15:31:10 +0000 (18:31 +0300)
committerAlexander Strizhakov <alex.strizhakov@gmail.com>
Thu, 12 Mar 2020 15:31:10 +0000 (18:31 +0300)
commit39ed608b13f9204e0503311c7394934b01501ab8
tree34250ed1c719224a3522fd1a841bbd0a360e1245
parent1306b92997dc6e76e5d617d529dbc229d5aee200
parent00d17520314e3591caaa7ab4ca39c6227a6bdf15
Merge branch 'develop' into gun
CHANGELOG.md
lib/pleroma/application.ex
lib/pleroma/config/transfer_task.ex
test/support/http_request_mock.ex