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 1488be7d96 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/controllers/home_controller.rb - app/controllers/shares_controller.rb - app/javascript/packs/public.js - app/models/status.rb - app/serializers/initial_state_serializer.rb - app/views/home/index.html.haml - app/views/layouts/public.html.haml - app/views/public_timelines/show.html.haml - app/views/shares/show.html.haml - app/views/tags/show.html.haml - config/initializers/content_security_policy.rb - config/locales/en.yml - config/webpack/shared.js - package.json		5 years ago
..
rules	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
configuration.js	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
development.js	Add OCR tool to media editing modal (#11566)	5 years ago
generateLocalePacks.js	…
production.js	Replace from uglifyjs to terser (#10956)	6 years ago
shared.js	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
test.js	Upgrade webpack to version v4.x (#6655)	7 years ago
translationRunner.js	Upgrade yargs to v12.0 (#9862)	6 years ago