Claire 9f92b05bd2 Merge commit '2e6bf60f1549e5c1f1cfea2d614f978bea17b8a2' into glitch-soc/merge-upstream ... Conflicts: - `README.md`: Upstream has updated their README but we have a completely different one. Kept our version of `README.md`		2023-12-10 18:05:02 +01:00
..
aliases	…
applications	Update haml-lint 0.49.1 (#26118)	2023-07-23 17:48:16 +02:00
deletes	…
exports	Issue 26048: swap "muting" and "blocking" list options in settings -> Data Exports (#26088)	2023-10-26 14:08:25 +00:00
featured_tags	…
flavours	…
imports	…
login_activities	Fix haml-lint `ConsecutiveSilentScripts` rule (#26043)	2023-07-18 09:25:37 +02:00
migration/redirects	…
migrations	…
preferences	Fix HAML linting issues	2023-10-24 20:53:58 +02:00
privacy	Merge commit '072112867b9a3ec090ad2c92d6363b47b2265d74' into glitch-soc/merge-upstream	2023-09-02 11:41:40 +02:00
profiles	Merge commit '1cdcd9dc08c91321f80ffe4822f6a3da15abeb2c' into glitch-soc/merge-upstream	2023-08-24 21:01:19 +02:00
shared	Add privacy tab in profile settings (#26484)	2023-08-14 18:52:45 +02:00
two_factor_authentication	…
two_factor_authentication_methods	Fix haml-lint `UnnecessaryStringOutput` for views (#27531)	2023-10-25 12:01:00 +00:00
verifications	…