Commit 2d3f2e87 authored by feld's avatar feld

Merge branch 'master' into 'master'

Pleroma projects are AGPLv3

See merge request !5
parents d98b406f d48762f8
Pipeline #11098 passed with stage
in 1 minute and 3 seconds