Merge remote-tracking branch 'remotes/origin/develop' into auth-improvements
authorIvan Tashkinov <ivantashkinov@gmail.com>
Mon, 7 Dec 2020 18:45:04 +0000 (21:45 +0300)
committerIvan Tashkinov <ivantashkinov@gmail.com>
Mon, 7 Dec 2020 18:45:04 +0000 (21:45 +0300)
commitc8e7ace812ef199b6d24013e7d2699daf1b79d55
treedecbb4f42b4758370e2151d946698a3c0c6e3593
parenta010c5b16a395d823a98cd088c83acd098930ade
parented76323776f2506cfefbe78c369fdb7ccfe3b650
Merge remote-tracking branch 'remotes/origin/develop' into auth-improvements

# Conflicts:
# CHANGELOG.md
CHANGELOG.md
test/pleroma/web/admin_api/controllers/config_controller_test.exs