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
..
v2
account_serializer.rb	Fix link verification for remote accounts (#8868)	2018-10-04 15:47:03 +02:00
application_serializer.rb
context_serializer.rb
conversation_serializer.rb	Add unread indicator to conversations (#9009)	2018-10-19 01:47:29 +02:00
credential_account_serializer.rb
custom_emoji_serializer.rb
filter_serializer.rb	Fix filter ID not being a string in REST API (#9303)	2018-11-19 10:37:57 +01:00
instance_serializer.rb
list_serializer.rb
media_attachment_serializer.rb
mute_serializer.rb
notification_serializer.rb
preview_card_serializer.rb
relationship_serializer.rb	Public profile endorsements (accounts picked by profile owner) (#8146)	2018-08-09 09:56:53 +02:00
report_serializer.rb
search_serializer.rb
status_serializer.rb	Add field to serialized local-only statuses	2018-11-13 18:55:57 +01:00
tag_serializer.rb	Track trending tags (#7638)	2018-05-27 21:45:30 +02:00
web_push_subscription_serializer.rb