Merge branch 'release/1.1.8' into 'stable'
authorlain <lain@soykaf.club>
Fri, 10 Jan 2020 12:44:31 +0000 (12:44 +0000)
committerlain <lain@soykaf.club>
Fri, 10 Jan 2020 12:44:31 +0000 (12:44 +0000)
commit1629fa2412b877f69c5cf0df09782227827b272b
tree054cfc99e789cffc1ca51d6ce3a51e37a0cdf7a6
parentecb3386f939de3ffba16f9419994a009f2e59ded
parente372917f6c7963f4e1358ccc3c1ebeb7be9edfad
Merge branch 'release/1.1.8' into 'stable'

Release/1.1.8

See merge request pleroma/pleroma!2096