Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms

author lain <lain@soykaf.club>

Fri, 29 May 2020 10:36:17 +0000 (12:36 +0200)

committer lain <lain@soykaf.club>

Fri, 29 May 2020 10:36:17 +0000 (12:36 +0200)
author lain <lain@soykaf.club>
Fri, 29 May 2020 10:36:17 +0000 (12:36 +0200)
committer lain <lain@soykaf.club>
Fri, 29 May 2020 10:36:17 +0000 (12:36 +0200)
diff --cc lib/pleroma/notification.ex
Simple merge
diff --cc lib/pleroma/web/activity_pub/activity_pub.ex
Simple merge
diff --cc lib/pleroma/web/activity_pub/transmogrifier.ex
Simple merge
diff --cc lib/pleroma/web/mastodon_api/views/account_view.ex
Simple merge
diff --cc test/web/mastodon_api/views/account_view_test.exs
Simple merge
author	lain <lain@soykaf.club>
	Fri, 29 May 2020 10:36:17 +0000 (12:36 +0200)
committer	lain <lain@soykaf.club>
	Fri, 29 May 2020 10:36:17 +0000 (12:36 +0200)
		1	2
lib/pleroma/notification.ex	patch \|	diff1 \|	diff2 \|	blob \| history
lib/pleroma/web/activity_pub/activity_pub.ex	patch \|	diff1 \|	diff2 \|	blob \| history
lib/pleroma/web/activity_pub/transmogrifier.ex	patch \|	diff1 \|	diff2 \|	blob \| history
lib/pleroma/web/mastodon_api/views/account_view.ex	patch \|	diff1 \|	diff2 \|	blob \| history
test/web/mastodon_api/views/account_view_test.exs	patch \|	diff1 \|	diff2 \|	blob \| history