Merge branch 'develop' into gun
authorAlexander Strizhakov <alex.strizhakov@gmail.com>
Mon, 16 Mar 2020 11:25:55 +0000 (14:25 +0300)
committerAlexander Strizhakov <alex.strizhakov@gmail.com>
Mon, 16 Mar 2020 11:25:55 +0000 (14:25 +0300)
commitf0651730bdf018b713e21ce718719c7781398362
tree836e0fbcbb49f0ae78635a268e30013c0e94aea7
parent98ed0d1c4bd2db354154cc4a1d1e6530eb68f499
parentc2527b8c63a4e35b121981efe2c39cc54c77648d
Merge branch 'develop' into gun
12 files changed:
CHANGELOG.md
config/config.exs
config/description.exs
config/test.exs
docs/configuration/cheatsheet.md
lib/pleroma/reverse_proxy/reverse_proxy.ex
mix.exs
mix.lock
test/activity/ir/topics_test.exs
test/reverse_proxy/reverse_proxy_test.exs
test/web/admin_api/admin_api_controller_test.exs
test/web/common_api/common_api_utils_test.exs