Merge branch 'fix-master-conflicts' into 'develop'

Browse Source

fix master/develop merge conflicts

See merge request pleroma/pleroma-fe!1712

merge-requests/1722/head

HJ 2 years ago

parent 75754168b2 045459c75c

commit 25e628efe2

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File

Diff Content Not Available