Thibaut Girka 07eb31eeac Merge branch 'master' into glitch-soc/merge-upstream ...

Conflicts:
- app/views/admin/settings/edit.html.haml:
  Conflict due to how the theming settings change.

2019-03-14 17:17:20 +01:00

..

v2

…

account_serializer.rb

…

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

…

credential_account_serializer.rb

…

custom_emoji_serializer.rb

…

filter_serializer.rb

…

instance_serializer.rb

Merge branch 'master' into glitch-soc/merge-upstream

2019-03-14 17:17:20 +01:00

list_serializer.rb

…

media_attachment_serializer.rb

…

mute_serializer.rb

…

notification_serializer.rb

Support pushing and receiving updates to poll tallies (#10209)

2019-03-11 00:49:31 +01:00

poll_serializer.rb

Immediately display poll results to poll author (#10187)

2019-03-07 22:53:47 +01:00

preview_card_serializer.rb

…

relationship_serializer.rb

…

report_serializer.rb

…

scheduled_status_serializer.rb

…

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

…