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 5b8a4f96de 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
..
babel.js	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
css.js	Fix build with new sass-loader	5 years ago
file.js	Bump webpacker from 3.5.5 to 4.0.2 (#10277)	6 years ago
index.js	Update Tesseract.js (#14708)	4 years ago
mark.js	Bump webpacker from 3.5.5 to 4.0.2 (#10277)	6 years ago
node_modules.js	Update Tesseract.js (#14708)	4 years ago
tesseract.js	Update Tesseract.js (#14708)	4 years ago