Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags...
authorIvan Tashkinov <ivantashkinov@gmail.com>
Thu, 21 Jan 2021 17:20:35 +0000 (20:20 +0300)
committerIvan Tashkinov <ivantashkinov@gmail.com>
Thu, 21 Jan 2021 17:20:35 +0000 (20:20 +0300)
commit2634a16b4cefebfb2a13550bde3fd12e5acd9aaa
tree1c43808f90f13a9e055464f01e4c8a36b28fe50b
parentb830605577f369d6b1a8730a5b3476ceea4fef5a
parentd8860eaee46c9bc0a079e90dfb008c54923d7330
Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework

# Conflicts:
# CHANGELOG.md
CHANGELOG.md
config/description.exs
lib/pleroma/application.ex
test/pleroma/object_test.exs
test/pleroma/web/common_api_test.exs