Skip to content
Snippets Groups Projects
Commit 02d1d38d authored by feld's avatar feld
Browse files

Merge branch 'merge/develop-20210106' into 'mfc-develop' 

Merge/develop 20210106

Closes pleroma/pleroma#2270, pleroma/pleroma#2346, and pleroma/secteam/pleroma#3

See merge request mfc/pleroma!89
parents bc9dbeb2 e7ec8eac
Branches
No related tags found
No related merge requests found
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 572 additions and 681 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment