Claire 5d5d0c06d8 Merge commit 'dec7a90989c823dba7f6322c3359c3cd861812e9' into glitch-soc/merge-upstream ... Conflicts: - `README.md`: Upstream has updated their README, we have a completely different one. Kept ours. - `config/initializers/content_security_policy.rb`: Upstream has updated their development CSPs, while we disable CSPs in the development environment. Kept our version.		2023-09-02 13:31:15 +02:00
..
development.rb	Improve Codespaces port forwarding (#26400)	2023-08-29 10:20:36 +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