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.

Claire 5e11f3a6e1 Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `app/javascript/styles/mastodon/modal.scss`: For some reason we changed the file loading path in glitch-soc, but now upstream has completely changed how the logo is loaded. Applied upstream changes.		3 years ago
..
components	Merge branch 'main' into glitch-soc/merge-upstream	3 years ago
containers	Add dropdown for boost privacy in boost confirmation modal (#15704)	3 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