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 c790ecb14d Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - `app/controllers/api/v1/statuses_controller.rb`: Conflict due to upstream adding a new parameter (with_rate_limit), too close to glitch-soc's own additional parameter (content_type). Added upstream's parameter. - `app/services/post_status_service.rb`: Conflict due to upstream adding a new parameter (rate_limit), too close to glitch-soc's own additional parameter (content_type). Added upstream's parameter. - `app/views/settings/preferences/appearance/show.html.haml`: Conflict due to us not exposing theme settings here (as we have a different flavour/skin menu). Took upstream change, while still not exposing theme settings. - `config/webpack/shared.js`: Coding style fixes for a part we have rewritten. Discarded upstream changes.		5 years ago
..
rules	Fix build with new sass-loader	5 years ago
configuration.js	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
development.js	Code style improvements in JavaScript (#13159)	5 years ago
generateLocalePacks.js	Javascript intl8n flavour support	7 years ago
production.js	Replace from uglifyjs to terser (#10956)	6 years ago
shared.js	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
tests.js	Revert CircleCI and some webpack changes to match upstream	5 years ago
translationRunner.js	Upgrade yargs to v12.0 (#9862)	6 years ago