Merge branch 'new-mastofe' into 'develop'
authorlambda <pleromagit@rogerbraun.net>
Sat, 31 Mar 2018 19:33:17 +0000 (19:33 +0000)
committerlambda <pleromagit@rogerbraun.net>
Sat, 31 Mar 2018 19:33:17 +0000 (19:33 +0000)
commit5fa8237bc1dcabca050dc5d8d9325fec649e1723
treecac60d44906c1f478d70d5897437656d540f75b9
parent86525e3a345d79b3ab3dcece72e6f6bc8f7af961
parent7f2174d81160b1e61b2a69b008575df3b2475f4b
Merge branch 'new-mastofe' into 'develop'

Bring Mastodon frontend up-to-date

See merge request pleroma/pleroma!87