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 c1c514ca70 Merge branch 'master' into glitch-soc/merge-upstream ... Manually-resolved conflicts: .circleci/config.yml app/controllers/accounts_controller.rb app/controllers/auth/passwords_controller.rb app/controllers/statuses_controller.rb app/javascript/packs/public.js app/models/media_attachment.rb app/views/stream_entries/_content_spoiler.html.haml app/views/stream_entries/_media.html.haml config/locales/en.yml config/locales/ja.yml config/locales/pl.yml lib/mastodon/version.rb Some content from app/javascript/packs/public.js has been split to app/javascript/core/settings.js. Translation strings for glitch-soc's keyword mutes were dropped. Everything else was mostly “take both”.		6 years ago
..
applications	Add more granular OAuth scopes (#7929)	6 years ago
deletes	…
exports	Add hint about 7 day cooldown for archive takeout (#7375)	7 years ago
flavours	…
follower_domains	…
imports	…
keyword_mutes	Add apply-to-mentions option to keyword mute UI. #454.	7 years ago
migrations	Redesign public profiles and toots (#8068)	6 years ago
notifications	…
preferences	Merge branch 'master' into glitch-soc/merge-upstream	7 years ago
profiles	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
shared	…
two_factor_authentication	…
two_factor_authentications	…