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

Conflicts:
- `README.md`:
  Upstream added some documentation in the README, but our README is pretty
  different and barebone.
  Kept our README.

2021-10-14 22:14:26 +02:00

..

development.rb

Prepare Mastodon for Rails 6 (#15911)

2021-03-17 10:09:55 +01:00

production.rb

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

2021-10-14 22:14:26 +02:00

test.rb

Misc. typos (#8694)

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