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 bf94a43496 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/controllers/oauth/authorized_applications_controller.rb Two changes too close to each other - app/controllers/settings/sessions_controller.rb - app/lib/user_settings_decorator.rb Two changes too close to each other - app/models/media_attachment.rb New changes too close to glitch-soc only changes. - app/models/user.rb Two changes too close to each other. - app/services/remove_status_service.rb Kept direct timeline code which had been removed upstream. - app/views/settings/preferences/show.html.haml Two changes too close to each other. - config/locales/en.yml Introduction of a new string too close to glitch-soc-only's “flavour” - config/locales/ja.yml Introduction of a new string too close to glitch-soc-only's “flavour” - config/locales/pl.yml Introduction of a new string too close to glitch-soc-only's “flavour” - config/locales/simple_form.en.yml Introduction of a new string too close to glitch-soc-only's “skin” - config/locales/simple_form.pl.yml Introduction of a new string too close to glitch-soc-only's “skin” - config/settings.yml Reverted upstream's decision of enabling posting application by default.		6 years ago
..
applications	Redesign forms, verify link ownership with rel="me" (#8703)	6 years ago
deletes	Fix autocomplete option in haml files (#4438)	7 years ago
exports	…
featured_tags	Add featured hashtags to profiles (#9755)	6 years ago
flavours	…
follower_domains	…
imports	Add option to overwrite imported data (#9962)	6 years ago
migrations	…
notifications	…
preferences	Make displaying application used to toot opt-in (#9897)	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	…