Thibaut Girka 45deca65b3 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - `app/javascript/packs/public.js`: Conflict because part of that file has been split to `app/javascript/core/settings.js`. Ported those changes there.		2020-07-01 19:23:14 +02:00
..
admin	…
concerns	Merge branch 'master' into glitch-soc/merge-upstream	2020-07-01 19:23:14 +02:00
form	…
web	…
account_alias_spec.rb	…
account_conversation_spec.rb	…
account_domain_block_spec.rb	…
account_filter_spec.rb	…
account_migration_spec.rb	…
account_moderation_note_spec.rb	…
account_spec.rb	…
account_stat_spec.rb	…
account_tag_stat_spec.rb	…
announcement_mute_spec.rb	…
announcement_reaction_spec.rb	…
announcement_spec.rb	…
backup_spec.rb	…
block_spec.rb	…
conversation_mute_spec.rb	…
conversation_spec.rb	…
custom_emoji_category_spec.rb	…
custom_emoji_filter_spec.rb	…
custom_emoji_spec.rb	…
custom_filter_spec.rb	…
device_spec.rb	…
domain_allow_spec.rb	…
domain_block_spec.rb	…
email_domain_block_spec.rb	…
encrypted_message_spec.rb	…
export_spec.rb	…
favourite_spec.rb	…
featured_tag_spec.rb	…
follow_request_spec.rb	…
follow_spec.rb	…
home_feed_spec.rb	…
identity_spec.rb	…
import_spec.rb	…
invite_spec.rb	…
list_account_spec.rb	…
list_spec.rb	…
marker_spec.rb	…
media_attachment_spec.rb	…
mention_spec.rb	…
mute_spec.rb	…
notification_spec.rb	…
one_time_key_spec.rb	…
poll_spec.rb	…
poll_vote_spec.rb	…
preview_card_spec.rb	…
relationship_filter_spec.rb	…
relay_spec.rb	…
remote_follow_spec.rb	…
report_filter_spec.rb	…
report_spec.rb	…
scheduled_status_spec.rb	…
session_activation_spec.rb	…
setting_spec.rb	…
site_upload_spec.rb	…
status_pin_spec.rb	…
status_spec.rb	…
status_stat_spec.rb	…
system_key_spec.rb	…
tag_spec.rb	…
trending_tags_spec.rb	…
unavailable_domain_spec.rb	…
user_invite_request_spec.rb	…
user_spec.rb	…