Merge branch '2019-06-29-pleromafe' into 'develop'
authorlain <lain@soykaf.club>
Fri, 28 Jun 2019 12:39:51 +0000 (12:39 +0000)
committerlain <lain@soykaf.club>
Fri, 28 Jun 2019 12:39:51 +0000 (12:39 +0000)
commitf5b015b998252da489da3ec76fd5dd75dbcb7435
tree4ec5b4ffc7d7b0314aaa32552aafc30ec9e1d31b
parentad249f6f5f6d3f53bd0da77b3e02f83823ea8e8b
parentefad26bbb9b134a684a6a0c21efa693f57824044
Merge branch '2019-06-29-pleromafe' into 'develop'

Update frontend.

See merge request pleroma/pleroma!1347