Claire 395b9011ee Merge commit 'd5f02adad716520b6b9014553bc730dcef5b2f50' into glitch-soc/merge-upstream ... Conflicts: - `app/helpers/application_helper.rb`: Not a real conflict, just upstream adding a method textually adjacent to glitch-soc only code. Ported upstream's change.		2024-06-17 18:30:28 +02:00
..
development.rb	Fix `Style/GlobalStdStream` cop in environments/* files (#30694)	2024-06-14 09:50:33 +00:00
production.rb	Merge commit 'd5f02adad716520b6b9014553bc730dcef5b2f50' into glitch-soc/merge-upstream	2024-06-17 18:30:28 +02:00
test.rb	Remove Status/ivar/shapes regression check from test env (#30580)	2024-06-07 10:00:51 +00:00