Claire b61c3ddff8 Merge branch 'main' into glitch-soc/merge-upstream ...

Conflicts:
- `README.md`:
  Upstream added some text, but our README is completely different.
  Kept our README unchanged.

2022-01-16 18:11:20 +01:00

..

development.rb

Fix warnings on Rails boot (#16946)

2021-12-27 00:47:20 +01:00

production.rb

Merge branch 'main' into glitch-soc/merge-upstream

2022-01-16 18:11:20 +01:00

test.rb

Misc. typos (#8694)

2018-09-14 00:53:09 +02:00