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 91bef4759f Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: Vagrantfile app/javascript/packs/public.js app/views/admin/settings/edit.html.haml app/views/settings/preferences/show.html.haml app/views/settings/profiles/show.html.haml config/locales/es.yml config/locales/simple_form.en.yml config/webpack/configuration.js config/webpack/loaders/babel.js package.json yarn.lock Split new additions to app/javascript/packs/public.js to app/javascript/core/settings.js		6 years ago
..
account_moderation_notes	…
accounts	…
action_logs	…
change_emails	Redesign forms, verify link ownership with rel="me" (#8703)	6 years ago
custom_emojis	Redesign forms, verify link ownership with rel="me" (#8703)	6 years ago
dashboard	…
domain_blocks	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
email_domain_blocks	Redesign forms, verify link ownership with rel="me" (#8703)	6 years ago
instances	…
invites	…
relays	Display pending message on admin relays UI (#8494)	6 years ago
report_notes	…
reports	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
settings	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
statuses	Allow to show a specific status in the admin interface	6 years ago
subscriptions	…
suspensions	Better singulars of account followers/toots. (#8471)	6 years ago