365de06816
Conflicts: - app/controllers/accounts_controller.rb - app/controllers/follower_accounts_controller.rb - app/controllers/statuses_controller.rb All conflicts caused by the additional `use_pack` used for glitch-soc's theming system. |
||
|---|---|---|
| .. | ||
| activitypub | ||
| rest | ||
| rss | ||
| web | ||
| initial_state_serializer.rb | ||
| manifest_serializer.rb | ||
| oembed_serializer.rb | ||
| webfinger_serializer.rb | ||