Thibaut Girka f513317ba2 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/models/status.rb - db/schema.rb Both conflicts are caused by us having extra database columns.		2019-03-05 19:23:16 +01:00
..
v2
account_serializer.rb	Add a per-user setting to hide followers count	2018-12-20 14:51:12 +01:00
application_serializer.rb	Add vapid_key to the application entity in the REST API (#10058)	2019-02-16 05:27:05 +01:00
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	Merge branch 'master' into glitch-soc/merge-upstream	2019-02-17 12:26:55 +01:00
list_serializer.rb	Add backend support to read and update list-specific show_replies settings	2018-11-28 14:46:07 +01:00
media_attachment_serializer.rb
mute_serializer.rb
notification_serializer.rb
poll_serializer.rb	Add polls (#10111)	2019-03-03 22:18:23 +01:00
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
scheduled_status_serializer.rb	Fix wrong param name in scheduled statuses and return params in API (#9725)	2019-01-06 12:03:27 +01:00
search_serializer.rb
status_serializer.rb	Merge branch 'master' into glitch-soc/merge-upstream	2019-03-05 19:23:16 +01:00
tag_serializer.rb
web_push_subscription_serializer.rb