Skip to content
Snippets Groups Projects
Commit 36b0af76 authored by lain's avatar lain
Browse files

Merge branch '2018-12-13-update-frontend' into 'develop' 

update frontend

See merge request pleroma/pleroma!544
parents b19ee622 72945b5b
No related branches found
No related tags found
No related merge requests found
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 118 additions and 58 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment