Thibaut Girka 6719b9daa5 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - `app/javascript/packs/public.js`: Upstream removed an unused function in code that has been refactored a bit. Removed that function in the corresponding places.		2020-01-20 18:31:11 +01:00
..
glitch	Merge branch 'master' into glitch-soc/merge-upstream	2020-01-20 18:31:11 +01:00
vanilla	Fix settings/flavours	2019-03-16 16:21:20 +01:00