Thibaut Girka 1d6152f440 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - config/locales/en.yml Conflict caused by the glitch-soc-specific “flavour” string being too close to the newly introduced “identity_proofs” string. Just included both.		2019-03-20 13:54:00 +01:00
..
access_token_fabricator.rb
accessible_access_token_fabricator.rb
account_domain_block_fabricator.rb
account_fabricator.rb
account_identity_proof_fabricator.rb	Add Keybase integration (#10297)	2019-03-18 21:00:55 +01:00
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_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	Add polls (#10111)	2019-03-03 22:18:23 +01:00
poll_vote_fabricator.rb	Add polls (#10111)	2019-03-03 22:18:23 +01:00
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
stream_entry_fabricator.rb
subscription_fabricator.rb
tag_fabricator.rb
user_fabricator.rb
web_push_subscription_fabricator.rb
web_setting_fabricator.rb