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 3fefb7909b Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - `config/webpack/shared.js`: Upstream has changed how Tesseract.js gets included and dropped a dependency. The conflict is caused by glitch-soc having different code due to its theming system. Ported upstream changes. - `lib/mastodon/version.rb`: Upstream refactor/code style change in a place we replaced upstream's repo URL with ours. Ported upstram changes, keeping our repo URL. - `yarn.lock`: Upstream dropped dependencies, one of which was textually too close to a glitch-soc-specific dependency. Not a real conflict.		4 years ago
..
rules	Merge branch 'master' into glitch-soc/merge-upstream	4 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	Bump imports-loader from 0.8.0 to 1.1.0 (#14323)	4 years ago
shared.js	Merge branch 'master' into glitch-soc/merge-upstream	4 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