David Yip 6dd676e006 Merge remote-tracking branch 'origin/master' into merge-upstream ...

Conflicts:
 	config/locales/pl.yml

The conflict in config/locales/pl.yml concerns the themes key, which is
not used in glitchsoc.  Resolution: remove the themes key-related
changes, i.e. accept-ours.

2018-05-21 16:30:24 -05:00

..

core

Merge remote-tracking branch 'origin/master' into gs-master

2018-05-03 17:23:44 -05:00

flavours

Fix width only being set for standalone media

2018-05-21 18:25:41 +02:00

fonts

Theme: Windows 95

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

images

Merge branch 'master' of https://github.com/tootsuite/mastodon

2018-02-23 23:28:31 +09: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-05-21 16:30:24 -05:00

packs

Merge branch 'master' into glitch-soc/merge

2018-05-14 20:51:50 +02:00

skins

Port Sylvhem's mastodon-light to glitch flavour

2018-05-07 17:00:02 +02:00

styles

Merge branch 'master' into glitch-soc/merge-upstream

2018-05-21 16:40:02 +02:00