You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

Thibaut Girka c1eb60642b Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - `app/controllers/concerns/sign_in_token_authentication_concern.rb`: Conflict due to glitch-soc's theming system. Ported upstream changes. - `app/controllers/concerns/two_factor_authentication_concern.rb`: Conflict due to glitch-soc's theming system. Ported upstream changes.		4 years ago
..
components	Merge branch 'master' into glitch-soc/merge-upstream	4 years ago
containers	Fix WebUI allowing to upload more items than the limit (#12300)	5 years ago
util	Misc. typos (#8694)	6 years ago
index.js	Add confirmation modal when logging out from the web app (#11671)	5 years ago