Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags...
authorIvan Tashkinov <ivantashkinov@gmail.com>
Sun, 31 Jan 2021 17:38:58 +0000 (20:38 +0300)
committerIvan Tashkinov <ivantashkinov@gmail.com>
Sun, 31 Jan 2021 17:38:58 +0000 (20:38 +0300)
commit1b49b8efe57256b3f64b4b7e8a1de805ab030814
tree2250cc1eb3d17b79c292b4ff4130172a6dea6c31
parent6fd4163ab60be07b1a20ac8911e105ddca8e2095
parent7ac0a819811496fe512544e91b6f0ff3d15b8856
Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework

# Conflicts:
# CHANGELOG.md
CHANGELOG.md
config/config.exs
config/description.exs
test/pleroma/web/activity_pub/activity_pub_test.exs
test/pleroma/web/activity_pub/transmogrifier/note_handling_test.exs
test/pleroma/web/common_api_test.exs