Claire 941a9df28a Merge commit '96bcee66fba582666259d1d7785c3a7f2a72b8aa' into glitch-soc/merge-upstream ... Conflicts: - `.github/workflows/build-nightly.yml`: Upstream changed how the nightly builds are versioned, the conflict is because glitch-soc modified adjacent lines relative to the docker repositories the images are pushed to. Applied upstream's changes. - `app/views/settings/preferences/notifications/show.html.haml`: Upstream moved some settings around. Glitch-soc had more settings. Applied upstream's changes, moving glitch-soc's extra settings accordingly.		2023-08-24 21:56:00 +02:00
..
aliases
applications	Update haml-lint 0.49.1 (#26118)	2023-07-23 17:48:16 +02:00
deletes
exports
featured_tags	Change edit profile page (#25413)	2023-06-14 04:38:07 +02:00
flavours
imports	Fix haml-lint Rubocop Style/StringLiterals cop (#25948)	2023-07-17 16:57:18 +02:00
login_activities	Fix haml-lint ConsecutiveSilentScripts rule (#26043)	2023-07-18 09:25:37 +02:00
migration/redirects
migrations
preferences	Merge commit '96bcee66fba582666259d1d7785c3a7f2a72b8aa' into glitch-soc/merge-upstream	2023-08-24 21:56:00 +02:00
privacy	Move glitch-soc's “Hide followers count” setting to “Show followers count” under “Privacy and reach” tab	2023-08-22 19:50:37 +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
verifications	Change edit profile page (#25413)	2023-06-14 04:38:07 +02:00