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 1159490f00 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
..
chewy	Full-text search for authorized statuses (#6423)	7 years ago
controllers	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
helpers	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
javascript	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
lib	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
mailers	Account archive download (#6460)	7 years ago
models	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
policies	Disallow remote users from viewing local-only toots	6 years ago
presenters	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	7 years ago
serializers	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
services	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
validators	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
views	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
workers	Fix ActivityPub::UpdateDistributionWorker regression (#8039)	6 years ago