Thibaut Girka ab5f450700 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: app/models/user.rb Resolved by adding :default_language to user settings fields		2018-06-21 20:49:57 +02:00
..
v2
account_serializer.rb
application_serializer.rb
context_serializer.rb
credential_account_serializer.rb
custom_emoji_serializer.rb
instance_serializer.rb
list_serializer.rb	Display list column (#5750)	2017-11-25 00:35:37 +01:00
media_attachment_serializer.rb
mute_serializer.rb
notification_serializer.rb
preview_card_serializer.rb
relationship_serializer.rb	Break out nested relationship API keys (#5887)	2017-12-06 16:10:54 +01:00
report_serializer.rb	Change IDs to strings rather than numbers in API JSON output (#5019)	2017-09-20 14:53:48 +02:00
search_serializer.rb	Refactor JSON templates to be generated with ActiveModelSerializers instead of Rabl (#4090)	2017-07-07 04:02:06 +02:00
status_serializer.rb
tag_serializer.rb
web_push_subscription_serializer.rb