Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags...
authorIvan Tashkinov <ivantashkinov@gmail.com>
Fri, 22 Jan 2021 07:05:28 +0000 (10:05 +0300)
committerIvan Tashkinov <ivantashkinov@gmail.com>
Fri, 22 Jan 2021 07:05:28 +0000 (10:05 +0300)
commit218c51960606454577a12fb6e417d66ab46f3965
tree831e8bef7e82021bf22ec057cb46716be70091b4
parentca7f24064304945587fc232325dce4b834ff6c94
parent42e495df2b8d72365e22f8be708051130bc81973
Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework

# Conflicts:
# test/pleroma/web/mastodon_api/views/status_view_test.exs
CHANGELOG.md
lib/pleroma/web/mastodon_api/views/status_view.ex
test/pleroma/web/mastodon_api/views/status_view_test.exs