Glitch-Shrike/app
Claire f3a4d57be1 Merge branch 'main' into glitch-soc/merge-upstream
Conflicts:
- `README.md`:
  Discarded upstream changes: we have our own README
- `app/controllers/follower_accounts_controller.rb`:
  Port upstream's minor refactoring
2022-12-15 20:25:25 +01:00
..
chewy
controllers Merge branch 'main' into glitch-soc/merge-upstream 2022-12-15 20:25:25 +01:00
helpers Merge branch 'main' into glitch-soc/merge-upstream 2022-12-15 20:25:25 +01:00
javascript Merge branch 'main' into glitch-soc/merge-upstream 2022-12-15 20:25:25 +01:00
lib Merge branch 'main' into glitch-soc/merge-upstream 2022-12-15 20:25:25 +01:00
mailers
models Merge branch 'main' into glitch-soc/merge-upstream 2022-12-15 20:25:25 +01:00
policies
presenters
serializers Merge branch 'main' into glitch-soc/merge-upstream 2022-12-15 20:25:25 +01:00
services Merge branch 'main' into glitch-soc/merge-upstream 2022-12-15 20:25:25 +01:00
validators
views Merge branch 'main' into glitch-soc/merge-upstream 2022-12-15 20:25:25 +01:00
workers Merge branch 'main' into glitch-soc/merge-upstream 2022-12-15 20:25:25 +01:00