Thibaut Girka de5cc20dd8 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - `app/controllers/concerns/sign_in_token_authentication_concern.rb`: Conflict caused because of glitch-soc's theming system. Took upstream's new code and applied the theming system changes on top of it. - `app/controllers/concerns/two_factor_authentication_concern.rb`: Conflict caused because of glitch-soc's theming system. Took upstream's new code and applied the theming system changes on top of it.		2020-11-14 00:30:36 +01:00
..
index.js	Merge branch 'master' into glitch-soc/merge-upstream	2020-11-14 00:30:36 +01:00