Thibaut Girka a02244f17c Merge branch 'master' into glitch-soc/merge-upstream ...

Conflicts:
	app/javascript/packs/public.js

Changes made to app/javascript/packs/publics.js were applied to
app/javascript/core/settings.js

2018-10-09 21:08:26 +02:00

..

core

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

2018-10-09 21:08:26 +02:00

flavours

Fix CW icon color in local-settings modal

2018-10-09 18:10:54 +02:00

fonts

Theme: Windows 95

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

images

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

2018-07-09 07:13:59 +02:00

locales

Javascript intl8n flavour support

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

mastodon

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

2018-10-09 12:12:03 +02:00

packs

Fix that the copy button of verify link did not work. (#8938)

2018-10-09 19:36:13 +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-10-08 13:51:33 +02:00