Merge branch 'update-pleroma-frontend' into 'develop'
authorkaniini <nenolod@gmail.com>
Sun, 26 Aug 2018 20:18:16 +0000 (20:18 +0000)
committerkaniini <nenolod@gmail.com>
Sun, 26 Aug 2018 20:18:16 +0000 (20:18 +0000)
commit3448b434f54e8b4749524e3ccd876359a6501845
tree8f5cafdbeaf3ab84b519a2a5b404d367c227e8ac
parent7faed99450221bab4d34f4853f877c6011d6bf21
parentce8c7e77a144ec100bb8031d07443c5941146a98
Merge branch 'update-pleroma-frontend' into 'develop'

update pleroma frontend

See merge request pleroma/pleroma!298