Claire 93912f0498 Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `app/models/account.rb`: Conflict because we (glitch-soc) have disabled trending of posts without review. Discarded that upstream change. - `app/views/admin/settings/discovery/show.html.haml`: Just an extra setting in glitch-soc. Kept that extra setting.		2022-11-12 13:28:03 +01:00
..
components	Merge branch 'main' into glitch-soc/merge-upstream	2022-11-12 13:28:03 +01:00
containers	Add the ability to edit media attachment metadata for any unattached media (#20402)	2022-11-11 21:22:17 +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	Fix redirecting to /publish when compose form is visible in web UI (#19427)	2022-10-23 23:37:58 +02:00