Thibaut Girka 89bee860cd Merge branch 'master' into glitch-soc/merge-upstream ...

Conflicts:
- app/services/post_status_service.rb
  Small conflict due to handling of instance-local toots.
  A subsequent change is required to ensure instance-local polls are not leaked
  through Update.

2019-03-11 11:23:50 +01:00

..

admin

…

concerns

…

form

…

web

…

account_conversation.rb

…

account_domain_block.rb

…

account_filter.rb

…

account_moderation_note.rb

…

account_pin.rb

…

account_stat.rb

…

account_tag_stat.rb

…

account_warning_preset.rb

…

account_warning.rb

…

account.rb

…

admin.rb

…

application_record.rb

…

backup.rb

…

block.rb

…

bookmark.rb

…

context.rb

…

conversation_mute.rb

…

conversation.rb

…

custom_emoji_filter.rb

…

custom_emoji.rb

…

custom_filter.rb

…

domain_block.rb

…

email_domain_block.rb

…

export.rb

…

favourite.rb

…

featured_tag.rb

…

feed.rb

…

follow_request.rb

…

follow.rb

…

home_feed.rb

…

identity.rb

…

import.rb

…

instance_filter.rb

…

instance.rb

…

invite_filter.rb

…

invite.rb

…

list_account.rb

…

list_feed.rb

…

list.rb

…

media_attachment.rb

…

mention.rb

…

mute.rb

…

notification.rb

…

poll_vote.rb

…

poll.rb

…

preview_card.rb

…

relay.rb

…

remote_follow.rb

…

remote_profile.rb

…

report_filter.rb

…

report_note.rb

…

report.rb

…

scheduled_status.rb

…

search.rb

…

session_activation.rb

…

setting.rb

…

site_upload.rb

…

status_pin.rb

…

status_stat.rb

…

status.rb

…

stream_entry.rb

…

subscription.rb

…

tag.rb

…

tombstone.rb

…

trending_tags.rb

…

user.rb

…

web.rb

…