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 c91d9b7389 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: app/lib/user_settings_decorator.rb app/models/user.rb app/serializers/initial_state_serializer.rb app/views/stream_entries/_simple_status.html.haml config/locales/simple_form.en.yml config/locales/simple_form.ja.yml config/locales/simple_form.pl.yml config/routes.rb		6 years ago
..
applications	Redesign forms, verify link ownership with rel="me" (#8703)	6 years ago
deletes	…
exports	Group reports by target account (#8674)	6 years ago
flavours	…
follower_domains	…
imports	Redesign forms, verify link ownership with rel="me" (#8703)	6 years ago
migrations	…
notifications	Add preference for report notification e-mails, skip for duplicates (#8559)	6 years ago
preferences	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
profiles	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
shared	…
two_factor_authentication	Redesign forms, verify link ownership with rel="me" (#8703)	6 years ago
two_factor_authentications	Redesign forms, verify link ownership with rel="me" (#8703)	6 years ago