Claire 155dc4bc4b Merge commit '34cd7d6585992c03298c175ab5d22ad059b58cdb' into glitch-soc/merge-upstream ... Conflicts: - `CONTRIBUTING.md`: Upstream changed the file, while we had a different one. Updated the common parts. - `README.md`: Upstream changed the file, while we had a different one. Updated the common parts. - `app/helpers/application_helper.rb`: Upstream added helpers where glitch-soc had extra ones. Added upstream's new helpers. - `app/models/form/admin_settings.rb`: Upstream added some custom handling of one setting, while glitch-soc had additional code. Ported upstream's code. - `lib/mastodon/version.rb`: Upstream moved some things to `config/mastodon.yml`. Did the same. - `spec/requests/api/v1/accounts/credentials_spec.rb`: I don't know honestly.		2025-01-10 20:41:36 +01:00
..
contrast	Update CSS color variables to match our latest design system (#31510)	2024-08-20 15:56:44 +00:00
fonts	Merge commit '7f471e70c0e1cc106747634d20f173a68a9272d7' into glitch-soc/merge-upstream	2024-01-15 21:30:00 +01:00
mastodon	Merge commit '34cd7d6585992c03298c175ab5d22ad059b58cdb' into glitch-soc/merge-upstream	2025-01-10 20:41:36 +01:00
mastodon-light	Fix various visual sign-up flow issues (#33206)	2024-12-09 08:23:19 +00:00
application.scss	Add year in review feature to web UI (#32709)	2024-11-05 14:40:07 +00:00
contrast.scss	…
inert.scss	Use the assets pipeline to load `inert.css` (#28701)	2024-01-12 09:32:45 +00:00
mailer.scss	Add terms of service (#33055)	2024-12-09 10:04:46 +00:00
mastodon-light.scss	…
win95.scss	Fix deprecation warning in win95 theme	2024-07-10 17:46:33 +02:00