Commit 6ccb4138 authored by kaiyou's avatar kaiyou

Merge branch 'dev' of https://github.com/pixelfed/pixelfed into dev

parents 1c8ccacc a63498c2
Pipeline #213 passed with stage
in 9 minutes and 58 seconds