Thibaut Girka 13ea29754d Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - config/locales/simple_form.ja.yml Not a real conflict, one new string was introduced in glitch and one in upstream.		2018-10-29 14:00:41 +01:00
..
core	Merge branch 'master' into glitch-soc/merge-upstream	2018-10-26 20:41:43 +02:00
flavours	Merge pull request #794 from ThibG/glitch-soc/merge-upstream	2018-10-28 20:36:55 +01: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-29 14:00:41 +01:00
packs	Merge branch 'master' into glitch-soc/merge-upstream	2018-10-26 20:41:43 +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-28 08:37:49 +01:00