Merge branch 'release/1.1.6' into 'stable'
authorrinpatch <rinpatch@sdf.org>
Tue, 19 Nov 2019 20:04:19 +0000 (20:04 +0000)
committerrinpatch <rinpatch@sdf.org>
Tue, 19 Nov 2019 20:04:19 +0000 (20:04 +0000)
commit0ba3f1ffb28792c21809fa9a30fc03a7a52d9361
tree0b1a885f966c36e296d8d48048ddf25fc30b7a93
parent36f4382b3367a889a191b124066fbbafab37d047
parent34206e4d7f2f5abe896882874e142374d987c44f
Merge branch 'release/1.1.6' into 'stable'

Release/1.1.6

See merge request pleroma/pleroma!1995