Claire 6f342a6d4c Merge commit '34e826f373d20f6230d1ef0aa03ad41a3bdf5998' into glitch-soc/merge-upstream ... Conflicts: - `app/helpers/theme_helper.rb`: Conflict caused by our different theme systems. Ported upstream's changes. - `app/models/account.rb`: Upstream basically made a change we already made. Moved constant declaration to match upstream.		2024-05-01 18:56:48 +02:00
..
admin/trends/links	Configure brakeman to ignore url safe preview card urls (#25883)	2023-10-20 15:32:16 +02:00
statuses	Merge commit '34e826f373d20f6230d1ef0aa03ad41a3bdf5998' into glitch-soc/merge-upstream	2024-05-01 18:56:48 +02:00