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)
commit13966f150469e2e7b6e02ffc8a7ab65b7c7bfaa7
treee3a284e6613f2b984617c811705005e373bbf74e
parent1f99abbeba88f852e02ac784d0ce7309785f3387
parent2b6cd10b68c01bb16f94c911da6fce51511a1a5a
Merge branch 'backport/1.1-branch-name-change' into 'maint/1.1'

Backport/1.1 branch name change

See merge request pleroma/pleroma!1841