Claire c6212d89f8 Merge commit '9e6c02fd815253712c2e8ba1c1ebed092a007653' into glitch-soc/merge-upstream ... Conflicts: - app/controllers/application_controller.rb: Upstream added an `include` where we had an extra `include` due to glitch-soc's theming system. Added upstream's new `include`.		2023-07-13 13:35:15 +02:00
..
development.rb	Rails 7.0 update (#25668)	2023-07-13 09:36:07 +02:00
production.rb	Merge commit '9e6c02fd815253712c2e8ba1c1ebed092a007653' into glitch-soc/merge-upstream	2023-07-13 13:35:15 +02:00
test.rb	Rails 7.0 update (#25668)	2023-07-13 09:36:07 +02:00