Skip to content
Snippets Groups Projects
Commit ebb34963 authored by Haelwenn's avatar Haelwenn
Browse files

Merge branch 'feature/rich-media-part-2-electric-boogaloo' into 'develop'

Rich Media support, part 2.

See merge request pleroma/pleroma!719
parents 009273fd 61d67157
Branches
No related tags found
No related merge requests found
Showing
with 159 additions and 131 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment