Merge branch 'update-mastofe/glitch-soc-2019-01-28' into 'develop'
authorHaelwenn <contact+git.pleroma.social@hacktivis.me>
Thu, 31 Jan 2019 10:12:48 +0000 (10:12 +0000)
committerHaelwenn <contact+git.pleroma.social@hacktivis.me>
Thu, 31 Jan 2019 10:12:48 +0000 (10:12 +0000)
commit5f40f4f74d96da7b54394e8d6fa29f00cd0c63fd
treef078dcecc151c49db4b99b90918d69941ae267e8
parent95d6118090fbd36fca4fd62133b270eaf27ae4df
parentde0c1c641a1709cf393aecc3ef666d827ef5ebde
Merge branch 'update-mastofe/glitch-soc-2019-01-28' into 'develop'

[MastodonFE] Update Frontend (glitch)

See merge request pleroma/pleroma!730