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

Conflicts:
	app/controllers/api/v1/mutes_controller.rb
	config/locales/simple_form.pl.yml

2018-08-27 18:09:28 +02:00

..

core

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

2018-08-26 14:23:24 +02:00

flavours

Update poylfills (fixes #662)

2018-08-23 22:58:25 +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-08-27 18:09:28 +02:00

packs

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

2018-08-26 14:23:24 +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-08-24 15:10:34 +02:00