This repository has been archived on 2024-07-22. You can view files and clone it, but cannot push or open issues or pull requests.

Claire 4ed09276d5 Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `.prettierignore`: Upstream added a line at the end of the file, while glitch-soc had its own extra lines. Took upstream's change. - `CONTRIBUTING.md`: We have our custom CONTRIBUTING.md quoting upstream. Upstream made changes. Ported upstream changes. - `app/controllers/application_controller.rb`: Upstream made code style changes in a method that is entirely replaced in glitch-soc. Ignored the change. - `app/models/account.rb`: Code style changes textually close to glitch-soc-specific changes. Ported upstream changes. - `lib/sanitize_ext/sanitize_config.rb`: Upstream code style changes. Ignored them.		2023-02-25 14:00:40 +01:00
..
contrast	Fix wrong colors in the high-contrast theme (#19708)	2022-11-04 02:28:14 +01:00
fonts	Merge branch 'main' into glitch-soc/merge-upstream	2023-02-13 19:35:35 +01:00
mastodon	Merge branch 'main' into glitch-soc/merge-upstream	2023-02-25 14:00:40 +01:00
mastodon-light	Increase contrast of upload progress background (#23836)	2023-02-23 12:58:42 +01:00
application.scss	Change public accounts pages to mount the web UI (#19319)	2022-10-20 14:35:29 +02:00
contrast.scss	…
mailer.scss	…
mastodon-light.scss	…
win95.scss	…