luna/mastodon
0
0
Fork 0
mirror of https://github.com/lunaisnotaboy/mastodon.git synced 2024-11-16 11:53:13 +00:00
Code Issues Projects Releases Wiki Activity
mastodon/db
History
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
..
migrate
post_migrate Merge branch 'main' into glitch-soc/merge-upstream 2022-12-07 09:03:42 +01:00
seeds
views
schema.rb Merge branch 'main' into glitch-soc/merge-upstream 2022-12-07 09:03:42 +01:00
seeds.rb