2 Commits (fb29f40a288b742f4724d50b9d47b800b43aadbb)

Author	SHA1	Message	Date
Claire	555e33a392	Merge commit 'b61ae28f8d4b6f269f50a05c3e65ec7f2c846d32' into glitch-soc/merge-upstream ... Conflicts: - `app/helpers/application_helper.rb`: Conflict because of our different theming systems. Updated accordingly, along with `app/helpers/theme_helper.rb` and `app/helpers/theme_helper_spec.rb`.	2024-05-01 18:38:55 +02:00
Matt Jankowski	b61ae28f8d	Separate methods for theme style and meta color tags (#29802)	2024-04-05 09:52:43 +00:00