David Yip 201e82686f Merge remote-tracking branch 'origin/master' into merge-upstream ...

Conflicts:
      app/javascript/styles/mastodon/components.scss

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

..

core

Fixed improper mailer import

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

flavours

Fix mailer to use webpack core

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

fonts

Theme: Windows 95

2017-10-26 23:22:48 -07:00

images

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

2018-01-17 18:37:09 -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 remote-tracking branch 'origin/master' into merge-upstream

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