Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags...
authorIvan Tashkinov <ivantashkinov@gmail.com>
Thu, 11 Feb 2021 16:31:57 +0000 (19:31 +0300)
committerIvan Tashkinov <ivantashkinov@gmail.com>
Thu, 11 Feb 2021 16:31:57 +0000 (19:31 +0300)
commit5992382cf86d89879b7a8e2dcbf26e910634a73a
tree56962d73ef162757190a5e1bfa37f1ba110d9907
parenta996ab46a54acbfa7a19da3eae12c78ed6466a1a
parent2cf753c5022dd7178d882e36e25b3a40dc403eff
Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework

# Conflicts:
# CHANGELOG.md
# lib/mix/tasks/pleroma/database.ex
# lib/pleroma/web/templates/feed/feed/_activity.rss.eex
CHANGELOG.md
config/config.exs
config/description.exs
lib/mix/tasks/pleroma/database.ex
lib/pleroma/application.ex
lib/pleroma/web/activity_pub/activity_pub.ex
lib/pleroma/web/templates/feed/feed/_activity.rss.eex