You cannot select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
mastodon/config/environments
Thibaut Girka 3f60b096b5 Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- `config/routes.rb`:
  Upstream disabled E2EE routes, which we did earlier, but slightly
  differently. Took upstream's version.
5 years ago
..
development.rb Add conversations API (#8832) 7 years ago
production.rb Merge branch 'master' into glitch-soc/merge-upstream 5 years ago
test.rb Misc. typos (#8694) 7 years ago