Claire b81710c02c Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `CONTRIBUTING.md`: Not a real conflict, glitch-soc quotes the upstream file, which has been changed. Update the quote.		2021-01-26 14:01:30 +01:00
..
components	Merge branch 'main' into glitch-soc/merge-upstream	2021-01-26 14:01:30 +01:00
containers	Make “Mark media as sensitive” properly translatable (#15051)	2020-10-27 03:05:50 +01:00
util	Misc. typos (#8694)	2018-09-14 00:53:09 +02:00
index.js	Add confirmation modal when logging out from the web app (#11671)	2019-08-26 18:24:10 +02:00