Thibaut Girka 6f0f583abe Merge branch 'master' into glitch-soc/merge-upstream		2018-07-11 17:57:08 +02:00
..
core	Merge remote-tracking branch 'origin/master' into gs-master	2018-05-03 17:23:44 -05:00
flavours	Display reply indicator even when replying to contentless toot (fixes #564)	2018-07-10 22:53:04 +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-07-11 17:57:08 +02:00
packs	Merge branch 'master' into glitch-soc/tentative-merge	2018-07-09 07:13:59 +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/tentative-merge	2018-07-09 07:13:59 +02:00