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 280d7b1df8 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: app/models/status.rb db/migrate/20180528141303_fix_accounts_unique_index.rb db/schema.rb Resolved by taking upstream changes (no real conflicts, just glitch-soc specific code too close to actual changes).		6 years ago
..
account_moderation_notes	Improve admin UI for accounts (#7360)	6 years ago
accounts	Remove unnecessary underline on accounts table (#7728)	6 years ago
action_logs	Improve report layout (#7188)	6 years ago
change_emails	Feature: Allow staff to change user emails (#7074)	6 years ago
custom_emojis	…
dashboard	Fix tag usage display on admin dashboard	6 years ago
domain_blocks	…
email_domain_blocks	…
instances	…
invites	…
relays	Add federation relay support (#7998)	6 years ago
report_notes	Improve report layout (#7188)	6 years ago
reports	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
settings	Add separate setting for sidebar text (site_short_description) (#8107)	6 years ago
statuses	Merge branch 'master' into glitch-soc/master	6 years ago
subscriptions	…