mirror of
https://github.com/funamitech/mastodon
synced 2024-12-12 21:59:04 +09:00
1d1c3a808a
Conflicts: - `app/models/user_settings.rb`: Upstream removed a setting textually adjacent to a glitch-soc-only setting. Removed the setting glitch-soc removed. |
||
---|---|---|
.. | ||
activitypub | ||
node_info | ||
rest | ||
web | ||
initial_state_serializer.rb | ||
manifest_serializer.rb | ||
oembed_serializer.rb | ||
webfinger_serializer.rb |