mirror of https://github.com/glitch-soc/mastodon
3465d39494
Conflicts: - `app/helpers/accounts_helper.rb`: Upstream removed a helper, textually adjacent to a glitch-soc-only one. Not really a conflict. Removed the helper as upstream did. - `app/views/layouts/embedded.html.haml`: Conflicts due to theming system. Adapted upstream's change to our theming system. - `app/views/statuses/_simple_status.html.haml`: Removed upstream, but we had local changes. Removed as upstream did. |
||
---|---|---|
.. | ||
activitypub | ||
node_info | ||
rest | ||
web | ||
initial_state_serializer.rb | ||
manifest_serializer.rb | ||
oauth_metadata_serializer.rb | ||
oembed_serializer.rb | ||
webfinger_serializer.rb |