Merge branch '2019-1-1-update-frontend' into 'develop'
authorlambda <pleromagit@rogerbraun.net>
Tue, 1 Jan 2019 16:55:37 +0000 (16:55 +0000)
committerlambda <pleromagit@rogerbraun.net>
Tue, 1 Jan 2019 16:55:37 +0000 (16:55 +0000)
commitb9ac7067ebef902be937de3889b8a62cbf1de9da
tree1f733f27648d452947a0fd13839e3cb50df58b50
parent32541172cd490d68ada7e65e9f59b71bb04e0bde
parent1dd0e0ed4c4028758869b559b359ad87a26c5df1
Merge branch '2019-1-1-update-frontend' into 'develop'

update frontend

See merge request pleroma/pleroma!616