Thibaut Girka cc94c90bf1 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - Gemfile - Gemfile.lock - app/controllers/about_controller.rb - app/controllers/auth/sessions_controller.rb		2019-09-30 12:23:57 +02:00
..
core	Merge branch 'master' into glitch-soc/merge-upstream	2019-09-05 11:36:41 +02:00
flavours	[Glitch] Fix eslint error of import/no-extraneous-dependencies	2019-09-18 17:27:51 +02:00
fonts	Theme: Windows 95	2017-10-26 23:22:48 -07: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-30 12:23:57 +02:00
packs	Merge branch 'master' into glitch-soc/merge-upstream	2019-09-30 12:23:57 +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-30 12:23:57 +02:00