You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

Thibaut Girka f8e07ca5cd Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/models/status.rb Resolved by taking both changes (not a real conflict, just changes too close to each other).		6 years ago
..
account_moderation_notes_controller.rb	…
accounts_controller.rb	Redesign admin accounts index (#9340)	6 years ago
action_logs_controller.rb	…
base_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
change_emails_controller.rb	…
confirmations_controller.rb	…
custom_emojis_controller.rb	…
dashboard_controller.rb	…
domain_blocks_controller.rb	Add option to block reports from domain (#8830)	6 years ago
email_domain_blocks_controller.rb	…
instances_controller.rb	Extract counters from accounts table to account_stats table (#9295)	6 years ago
invites_controller.rb	…
relays_controller.rb	…
report_notes_controller.rb	…
reported_statuses_controller.rb	…
reports_controller.rb	Add "disable" button to report screen (#9024)	6 years ago
resets_controller.rb	…
roles_controller.rb	…
settings_controller.rb	Allow selecting both default flavour and theme	6 years ago
silences_controller.rb	…
statuses_controller.rb	…
subscriptions_controller.rb	…
suspensions_controller.rb	…
two_factor_authentications_controller.rb	…