Merge branch 'master-to-stable' into 'develop'
authorrinpatch <rinpatch@sdf.org>
Mon, 14 Oct 2019 16:08:53 +0000 (16:08 +0000)
committerrinpatch <rinpatch@sdf.org>
Mon, 14 Oct 2019 16:08:53 +0000 (16:08 +0000)
commit8b39d6f93cc6f9aecc76d67a686087366c3c50fd
tree39e31c70233a4702b479666dd1fcf23c1b5f19ba
parente3b4a3e96b2ffbc6d920155cd41687414045d4d6
parent17b8896c40fa1c4aaab96f82fd07d5f5f2698400
Merge branch 'master-to-stable' into 'develop'

Preparations for renaming `master` to `stable`

See merge request pleroma/pleroma!1840