Claire 5a89279d20 Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `app/validators/status_length_validator.rb`: Upstream changes too close to glitch-soc MAX_CHARS changes, but not a real conflict. Applied upstream changes. - `package.json`: glitch-soc-only dependency textually too close to a dependency updated upstream, not a real conflict. Applied upstream changes.		2021-03-02 12:06:58 +01:00
..
components	Merge branch 'main' into glitch-soc/merge-upstream	2021-02-12 10:28:32 +01:00
containers	Add dropdown for boost privacy in boost confirmation modal (#15704)	2021-02-11 00:53:12 +01:00
util	Update twitter-text from 1.14 to 3.1.0 and fix toot character counting (#15382)	2021-03-02 12:02:56 +01:00
index.js	Add confirmation modal when logging out from the web app (#11671)	2019-08-26 18:24:10 +02:00