Thibaut Girka 5cadb47238 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/controllers/auth/sessions_controller.rb Minor conflict due to glitch-soc's theming code		2019-09-18 17:25:56 +02:00
..
core	Merge branch 'master' into glitch-soc/merge-upstream	2019-09-05 11:36:41 +02:00
flavours	Fix composer dropdown toggle buttons (threaded mode and local-only) not working	2019-09-18 00:11:03 +02:00
fonts	Theme: Windows 95	2018-01-05 16:22:58 -08:00
images	Merge branch 'master' into glitch-soc/merge-upstream	2019-06-10 18:59:53 +02:00
locales	Merge branch 'master' into glitch-soc/merge-upstream	2018-12-01 21:00:16 +01:00
mastodon	Merge branch 'master' into glitch-soc/merge-upstream	2019-09-18 17:25:56 +02:00
packs	Merge branch 'master' into glitch-soc/merge-upstream	2019-09-18 17:25:56 +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	2019-09-18 17:25:56 +02:00