Merge branch 'release/1.1.5' into 'stable'
authorrinpatch <rinpatch@sdf.org>
Sat, 9 Nov 2019 13:32:11 +0000 (13:32 +0000)
committerrinpatch <rinpatch@sdf.org>
Sat, 9 Nov 2019 13:32:11 +0000 (13:32 +0000)
commit182aee9fe865dde5d7271deaa3245f651918d57e
tree34e5a2a065d78ad0a3dbad2bddacd2dad579ae92
parent21716aa594064d5f4f4a91a8b40a679775709e1d
parent287d92c9202de151c917550a5bfc5715d57dff83
Merge branch 'release/1.1.5' into 'stable'

Release/1.1.5

See merge request pleroma/pleroma!1954