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
..
appearance	Merge commit 'ce1f35d7e213327549b960bb64f63c67a141ea40' into glitch-soc/merge-upstream	2023-07-30 14:58:56 +02:00
notifications	Merge commit '96bcee66fba582666259d1d7785c3a7f2a72b8aa' into glitch-soc/merge-upstream	2023-08-24 21:56:00 +02:00
other	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