Commit b3aa50c5 authored by kaiyou's avatar kaiyou

Merge branch 'develop' of github.com:chocobozzz/peertube into develop

parents 307a6b9b d7ea359d
Pipeline #55 passed with stage
in 34 minutes and 57 seconds