Merge branch 'backport/1.1-branch-name-change' into 'maint/1.1'
authorrinpatch <rinpatch@sdf.org>
Mon, 14 Oct 2019 16:47:27 +0000 (16:47 +0000)
committerrinpatch <rinpatch@sdf.org>
Mon, 14 Oct 2019 16:47:27 +0000 (16:47 +0000)
Backport/1.1 branch name change

See merge request pleroma/pleroma!1841


Trivial merge