Merge branch 'develop' into gun
authorAlexander Strizhakov <alex.strizhakov@gmail.com>
Tue, 3 Mar 2020 07:08:07 +0000 (10:08 +0300)
committerAlexander Strizhakov <alex.strizhakov@gmail.com>
Tue, 3 Mar 2020 07:08:07 +0000 (10:08 +0300)
commit509c81e4b10bd8ba6d3a93889cd6fbbbfbcbab21
tree6939fe33f705c384bdf2bc05a348be02b64ec3fc
parentf987d83885eef7cd8d114feefe8870a8c5e841c6
parent4c02e049358441529c54a72cd11f1c81ee897d49
Merge branch 'develop' into gun
18 files changed:
CHANGELOG.md
config/config.exs
docs/configuration/cheatsheet.md
lib/mix/tasks/pleroma/emoji.ex
lib/pleroma/application.ex
lib/pleroma/config/config_db.ex
lib/pleroma/config/transfer_task.ex
lib/pleroma/object/fetcher.ex
lib/pleroma/web/activity_pub/mrf/media_proxy_warming_policy.ex
lib/pleroma/web/rel_me.ex
lib/pleroma/web/rich_media/parser.ex
mix.lock
test/config/config_db_test.exs
test/http/request_builder_test.exs
test/notification_test.exs
test/support/http_request_mock.ex
test/web/admin_api/admin_api_controller_test.exs
test/web/common_api/common_api_utils_test.exs