Conflicts: - `app/controllers/auth/setup_controller.rb`: Upstream removed a method close to a glitch-soc theming-related method. Removed the method like upstream did. |
||
|---|---|---|
| .. | ||
| activitypub | ||
| nodeinfo | ||
| rest | ||
| web | ||
| initial_state_serializer.rb | ||
| manifest_serializer.rb | ||
| oembed_serializer.rb | ||
| webfinger_serializer.rb | ||