Alex Gleason 0f4e0e667e Merge branch 'recipients-inline' into 'develop' ... ForceMentionsInContent: wrap mentions in a span, fix the formatting See merge request pleroma/pleroma!3620		2022-01-25 17:43:39 +00:00
..
mix	Merge remote-tracking branch 'origin/develop' into live-dashboard	2021-12-15 19:05:36 -05:00
phoenix/transports/web_socket	Bump Copyright to 2021	2021-01-13 07:49:50 +01:00
pleroma	Merge branch 'recipients-inline' into 'develop'	2022-01-25 17:43:39 +00:00