Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags...

author Ivan Tashkinov <ivantashkinov@gmail.com>

Sun, 7 Mar 2021 08:34:39 +0000 (11:34 +0300)

committer Ivan Tashkinov <ivantashkinov@gmail.com>

Sun, 7 Mar 2021 08:34:39 +0000 (11:34 +0300)
author Ivan Tashkinov <ivantashkinov@gmail.com>
Sun, 7 Mar 2021 08:34:39 +0000 (11:34 +0300)
committer Ivan Tashkinov <ivantashkinov@gmail.com>
Sun, 7 Mar 2021 08:34:39 +0000 (11:34 +0300)
diff --cc CHANGELOG.md
Simple merge
diff --cc lib/pleroma/web/mastodon_api/views/status_view.ex
Simple merge
diff --cc mix.exs
Simple merge
diff --cc mix.lock
Simple merge
author	Ivan Tashkinov <ivantashkinov@gmail.com>
	Sun, 7 Mar 2021 08:34:39 +0000 (11:34 +0300)
committer	Ivan Tashkinov <ivantashkinov@gmail.com>
	Sun, 7 Mar 2021 08:34:39 +0000 (11:34 +0300)
		1	2
CHANGELOG.md	patch \|	diff1 \|	diff2 \|	blob \| history
lib/pleroma/web/mastodon_api/views/status_view.ex	patch \|	diff1 \|	diff2 \|	blob \| history
mix.exs	patch \|	diff1 \|	diff2 \|	blob \| history
mix.lock	patch \|	diff1 \|	diff2 \|	blob \| history