Thibaut Girka 1619efd735 Do not discard statuses obtained via websocket when API request finishes ...

This backports 0b888acfd4

2018-01-19 21:59:12 +01:00

..

core

Fixed improper mailer import

2018-01-15 21:23:26 -08:00

flavours

Do not discard statuses obtained via websocket when API request finishes

2018-01-19 21:59:12 +01:00

fonts

Theme: Windows 95

2018-01-05 16:22:58 -08:00

images

Merge pull request #332 from glitch-soc/merge-upstream

2018-01-18 22:00:11 -06:00

locales

Javascript intl8n flavour support

2017-12-10 11:08:04 -08:00

mastodon

Merge remote-tracking branch 'origin/master' into merge-upstream

2018-01-17 18:37:09 -06:00

packs

Fix mailer to use webpack core

2018-01-15 21:17:03 -08:00

skins/vanilla/win95

Ruby intl8n for themes

2017-12-10 11:08:04 -08:00

styles

Merge pull request #332 from glitch-soc/merge-upstream

2018-01-18 22:00:11 -06:00