Claire be493b6c0d Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `app/models/account.rb`: Not a real conflict, just upstream getting rid of unused constants too close to glitch-soc-specific contents. Removed unused constants like upstream did. - `app/models/trends.rb`: Conflict because glitch-soc disabled email notifications for trending links. Upstream has refactored this quite a bit and added trending posts. Took upstream code, but disabling the extra trending stuff will come in another commit. - `app/views/admin/trends/links/index.html.haml`: Conflict due to glitch-soc's theming system. Ported upstream changes accordingly.		2022-02-26 09:29:23 +01:00
..
components	Merge branch 'main' into glitch-soc/merge-upstream	2022-02-26 09:29:23 +01:00
containers	Fix controls for unchangeable properties on status edit not being disabled (#17531)	2022-02-12 19:00:33 +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 drawer tab menu routes in advanced web ui (#16793)	2021-09-30 05:19:08 +02:00