This repository has been archived on 2024-07-22. You can view files and clone it, but cannot push or open issues or pull requests.

Thibaut Girka 24968d20a0 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/controllers/directories_controller.rb - package.json - yarn.lock		2019-07-30 12:22:33 +02:00
..
account_actions_controller.rb	…
account_moderation_notes_controller.rb	…
accounts_controller.rb	Remove Salmon and PubSubHubbub (#11205)	2019-07-06 23:26:16 +02:00
action_logs_controller.rb	…
base_controller.rb	…
change_emails_controller.rb	…
confirmations_controller.rb	…
custom_emojis_controller.rb	…
dashboard_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	2019-07-19 18:26:49 +02:00
domain_allows_controller.rb	Add whitelist mode (#11291)	2019-07-30 11:10:46 +02:00
domain_blocks_controller.rb	Fix some flash notices/alerts staying on unrelated pages (#11364)	2019-07-19 23:13:21 +02:00
email_domain_blocks_controller.rb	…
followers_controller.rb	…
instances_controller.rb	Add whitelist mode (#11291)	2019-07-30 11:10:46 +02:00
invites_controller.rb	…
pending_accounts_controller.rb	…
relays_controller.rb	…
report_notes_controller.rb	…
reported_statuses_controller.rb	…
reports_controller.rb	…
resets_controller.rb	…
roles_controller.rb	…
settings_controller.rb	…
statuses_controller.rb	…
subscriptions_controller.rb	…
tags_controller.rb	…
two_factor_authentications_controller.rb	…
warning_presets_controller.rb	…