Skip to content
Snippets Groups Projects
Commit 770f9fbd authored by Eliot Berriot's avatar Eliot Berriot
Browse files

Merge branch 'develop' into 'develop' 

First version of Apache2 conf (transcoding, auth and ws missing)

See merge request funkwhale/funkwhale!165
parents 9ab20a5b d1835455
No related branches found
No related tags found
Hide whitespace changes
Inline Side-by-side
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