mirror of
https://github.com/glitch-soc/mastodon.git
synced 2024-11-25 01:24:02 -05:00
bd349cb850
Conflicts: - `db/schema.rb`: Upstream regenerated the schema file using Rails 7, the conflicts are caused by our extra columns. Applied upstream's changes, but keeping our extra columns. |
||
---|---|---|
.. | ||
activitypub | ||
nodeinfo | ||
rest | ||
web | ||
initial_state_serializer.rb | ||
manifest_serializer.rb | ||
oembed_serializer.rb | ||
webfinger_serializer.rb |