luna/mastodon
0
0
Fork 0
mirror of https://github.com/lunaisnotaboy/mastodon.git synced 2025-01-05 20:17:27 +00:00
Code Issues Projects Releases Wiki Activity
mastodon/app/serializers
History
Thibaut Girka f8e07ca5cd Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- app/models/status.rb

Resolved by taking both changes (not a real conflict, just changes too close
to each other).
2018-11-27 13:23:02 +01:00
..
activitypub Improve support for aspects/circles (#8950) 2018-10-17 17:13:04 +02:00
rest Merge branch 'master' into glitch-soc/merge-upstream 2018-11-27 13:23:02 +01:00
rss
web
initial_state_serializer.rb Merge branch 'master' into glitch-soc/merge-upstream 2018-10-22 17:51:38 +02:00
manifest_serializer.rb
oembed_serializer.rb
webfinger_serializer.rb