fedi/mastodon
1
0
Fork 1
mirror of https://github.com/mastodon/mastodon.git synced 2024-12-28 19:10:31 +00:00
Code Issues Packages Projects Releases Wiki Activity
mastodon/app/serializers
History
Thibaut Girka 01eaeab56d Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- `app/controllers/application_controller.rb`:
  Conflict due to theming system.
- `app/controllers/oauth/authorizations_controller.rb`:
  Conflict due to theming system.
2020-01-04 23:04:42 +01:00
..
activitypub Merge branch 'master' into glitch-soc/merge-upstream 2019-12-07 12:28:59 +01:00
nodeinfo
rest Merge branch 'master' into glitch-soc/merge-upstream 2020-01-04 23:04:42 +01:00
rss Split AccountsHelper from StatusesHelper (#12078) 2019-10-24 22:50:09 +02:00
web
initial_state_serializer.rb Merge branch 'master' into glitch-soc/merge-upstream 2019-10-27 12:14:01 +01:00
manifest_serializer.rb
oembed_serializer.rb
webfinger_serializer.rb