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 c56a504d11 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - `app/serializers/rest/account_serializer.rb`: Upstream added code too close to glitch-soc-specific followers-hiding code. Ported upstream changes.		5 years ago
..
account_actions_controller.rb	…
account_moderation_notes_controller.rb	…
accounts_controller.rb	…
action_logs_controller.rb	…
announcements_controller.rb	…
base_controller.rb	…
change_emails_controller.rb	…
confirmations_controller.rb	…
custom_emojis_controller.rb	…
dashboard_controller.rb	…
domain_allows_controller.rb	…
domain_blocks_controller.rb	…
email_domain_blocks_controller.rb	…
instances_controller.rb	…
invites_controller.rb	…
pending_accounts_controller.rb	…
relationships_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	…