This repository has been archived on 2024-07-22. You can view files and clone it, but cannot push or open issues or pull requests.
mastodon/app
Claire 9a3d91f629 Merge branch 'main' into glitch-soc/merge-upstream
Conflicts:
- `app/models/concerns/domain_materializable.rb`:
  Fixed a code style issue upstream in a PR that got merged in glitch-soc
  earlier.
  Changed the code to match upstream's.
2022-12-07 09:03:42 +01:00
..
chewy
controllers Merge branch 'main' into glitch-soc/merge-upstream 2022-12-07 09:03:42 +01:00
helpers
javascript Merge branch 'main' into glitch-soc/merge-upstream 2022-12-07 09:03:42 +01:00
lib Fix unbounded recursion in account discovery (#22025) 2022-12-07 00:15:24 +01:00
mailers
models Merge branch 'main' into glitch-soc/merge-upstream 2022-12-07 09:03:42 +01:00
policies
presenters
serializers
services Fix unbounded recursion in account discovery (#22025) 2022-12-07 00:15:24 +01:00
validators
views
workers