Skip to content
Snippets Groups Projects
Commit b46156be authored by kaniini's avatar kaniini
Browse files

Merge branch 'update/pleroma-fe-20180818' into 'develop'

update pleroma frontend

See merge request pleroma/pleroma!276
parents 4ad7531d d8bb2797
Branches master
No related tags found
No related merge requests found
Pipeline #7735 failed
Showing
with 49 additions and 48 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment