mirror of
https://github.com/glitch-soc/mastodon.git
synced 2024-11-30 20:10:24 -05:00
18556d3e9b
Conflicts: - `app/helpers/application_helper.rb`: Upstream refactored some helpers and moved them in another file. Not a real conflict, but glitch-soc had adjacent glitch-only definitions. Kept glitch-soc definitions where they are and moved upstream ones 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 | ||