Thibaut Girka 444796b69b Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/controllers/application_controller.rb - app/controllers/auth/confirmations_controller.rb - app/controllers/auth/sessions_controller.rb - app/controllers/settings/deletes_controller.rb - app/controllers/settings/two_factor_authentication/recovery_codes_controller.rb		2019-07-23 10:51:07 +02:00
..
assets	…
access_token_fabricator.rb	…
accessible_access_token_fabricator.rb	…
account_domain_block_fabricator.rb	…
account_fabricator.rb	…
account_identity_proof_fabricator.rb	…
account_moderation_note_fabricator.rb	…
account_pin_fabricator.rb	…
account_stat_fabricator.rb	…
account_tag_stat_fabricator.rb	…
account_warning_fabricator.rb	…
account_warning_preset_fabricator.rb	…
admin_action_log_fabricator.rb	…
application_fabricator.rb	…
backup_fabricator.rb	…
block_fabricator.rb	…
bookmark_fabricator.rb	…
conversation_account_fabricator.rb	…
conversation_fabricator.rb	…
conversation_mute_fabricator.rb	…
custom_emoji_category_fabricator.rb	…
custom_emoji_fabricator.rb	…
custom_filter_fabricator.rb	…
domain_block_fabricator.rb	…
email_domain_block_fabricator.rb	…
favourite_fabricator.rb	…
featured_tag_fabricator.rb	…
follow_fabricator.rb	…
follow_request_fabricator.rb	…
identity_fabricator.rb	…
import_fabricator.rb	…
invite_fabricator.rb	…
list_account_fabricator.rb	…
list_fabricator.rb	…
media_attachment_fabricator.rb	…
mention_fabricator.rb	…
mute_fabricator.rb	…
notification_fabricator.rb	…
poll_fabricator.rb	…
poll_vote_fabricator.rb	…
relay_fabricator.rb	…
report_fabricator.rb	…
report_note_fabricator.rb	…
scheduled_status_fabricator.rb	…
session_activation_fabricator.rb	…
setting_fabricator.rb	…
site_upload_fabricator.rb	…
status_fabricator.rb	…
status_pin_fabricator.rb	…
status_stat_fabricator.rb	…
tag_fabricator.rb	…
user_fabricator.rb	…
user_invite_request_fabricator.rb	…
web_push_subscription_fabricator.rb	…
web_setting_fabricator.rb	…