This repository has been archived on 2024-07-22. You can view files and clone it, but cannot push or open issues or pull requests.
mastodon/app/serializers
Thibaut Girka 0437d70628 Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- `app/controllers/follower_accounts_controller.rb`:
  Conflict due to upstream changing suspension logic while
  glitch-soc has an extra option to hide followers count.
  Ported upstream changes.
2020-11-08 14:20:35 +01:00
..
activitypub Merge branch 'master' into glitch-soc/merge-upstream 2020-11-08 14:20:35 +01:00
nodeinfo
rest Merge branch 'master' into glitch-soc/merge-upstream 2020-11-07 18:23:02 +01:00
rss
web
initial_state_serializer.rb Merge branch 'master' into glitch-soc/merge-upstream 2020-10-21 19:10:50 +02:00
manifest_serializer.rb
oembed_serializer.rb
webfinger_serializer.rb