Merge branch 'bump-mastofe-2018-09-20' into 'develop'
authorHaelwenn <git.pleroma.social@hacktivis.me>
Thu, 20 Sep 2018 16:24:32 +0000 (16:24 +0000)
committerHaelwenn <git.pleroma.social@hacktivis.me>
Thu, 20 Sep 2018 16:24:32 +0000 (16:24 +0000)
commitf2727e23eeb66c8f53d06013c28fef313a5527de
tree2552e38119eb5b9464b75ae4b09bedaec2f814cf
parent7458adc2567caf90c3b01ef4b8bf90a67cbc041c
parent83e3afac2c9002e224718e8270c4e5550316e762
Merge branch 'bump-mastofe-2018-09-20' into 'develop'

Update mastodon frontend

Closes https://git.pleroma.social/pleroma/mastofe/issues/33

See: https://git.pleroma.social/pleroma/pleroma/merge_requests/352