masto-fe/config/environments
Claire 09c61e1376 Merge branch 'main' into glitch-soc/merge-upstream
Conflicts:
- `README.md`:
  We have completely different contents. Kept our version.
- `package.json`:
  Not a real conflict, just an upstream dependency udpated
  textually too close to a glitch-soc-only dependency.
  Updated dependencies like upstream.
- `streaming/index.js`:
  Conflict due to code style changes on parts that were
  modified in glitch-soc to handle local-only toots.
  Changed style according to upstream.
2021-12-27 15:16:18 +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 2021-10-14 22:14:26 +02:00
test.rb Misc. typos (#8694) 2018-09-14 00:53:09 +02:00