Skip to content
Snippets Groups Projects
Commit 7c26435e authored by Shpuld Shpludson's avatar Shpuld Shpludson
Browse files

Merge branch 'develop' into 'master'

Update master with bugfixes (and other changes)

See merge request pleroma/pleroma-fe!673
parents 7e9c8c3d f3975376
Branches
Tags
Loading
Showing
with 235 additions and 72 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment