mirror of
https://git.kescher.at/CatCatNya/catstodon.git
synced 2025-01-21 05:54:05 +01:00
395b9011ee
Conflicts: - `app/helpers/application_helper.rb`: Not a real conflict, just upstream adding a method textually adjacent to glitch-soc only code. Ported upstream's change. |
||
---|---|---|
.. | ||
activitypub | ||
node_info | ||
rest | ||
web | ||
initial_state_serializer.rb | ||
manifest_serializer.rb | ||
oauth_metadata_serializer.rb | ||
oembed_serializer.rb | ||
webfinger_serializer.rb |