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

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

Merge/develop 20200914

Closes pleroma/pleroma#1375, pleroma/pleroma#1374, pleroma/pleroma#1687, pleroma/pleroma#1362, pleroma/pleroma#1980, pleroma/pleroma-docker-compose#2, and #2

See merge request mfc/pleroma!83
parents 6cf38c53 14e30424
No related branches found
No related tags found
No related merge requests found
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 1407 additions and 387 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment