Merge branch 'release/2.1.2' into 'stable'
authorrinpatch <rinpatch@sdf.org>
Thu, 17 Sep 2020 19:09:10 +0000 (19:09 +0000)
committerrinpatch <rinpatch@sdf.org>
Thu, 17 Sep 2020 19:09:10 +0000 (19:09 +0000)
commita0f5e8b27edbe2224d9c2c3997ad5b8ea484244b
tree4a7a0f02e5880b7dff3ac20eaf59d71c7b584e5e
parent425324aae3d4534bc045466a1cc15653ddfa27d2
parent34afc2b0745b39861d9381e69cdb4b9c158f86ee
Merge branch 'release/2.1.2' into 'stable'

Release/2.1.2

See merge request pleroma/secteam/pleroma!17