0
0
Fork 0
mirror of https://github.com/lunaisnotaboy/mastodon.git synced 2025-01-02 10:37:08 +00:00
mastodon/spec
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
..
config/initializers
controllers Merge branch 'main' into glitch-soc/merge-upstream 2022-12-07 09:03:42 +01:00
fabricators
features
fixtures
helpers
lib
mailers
models Merge branch 'main' into glitch-soc/merge-upstream 2022-12-07 09:03:42 +01:00
policies
presenters
requests
routing
serializers/activitypub
services
support
validators
views/statuses
workers
rails_helper.rb
spec_helper.rb