diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2019-09-13 18:13:43 +0200 |
|---|---|---|
| committer | Thibaut Girka <thib@sitedethib.com> | 2019-09-13 18:13:43 +0200 |
| commit | 74c5b2bd08f844aac03ca6f9653bac4f4eea3a43 (patch) | |
| tree | ef0f56bc549ae22b134c749decadbd69f783b7e4 /package.json | |
| parent | c7f71b974f1a57cd93f86e5a678018d4aea8e728 (diff) | |
| parent | 18331fefa2246facc818226043b1f9cc67cf6c1a (diff) | |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: - Gemfile - app/controllers/api/v1/search_controller.rb Conflict because we changed the number of default results to be configurable - app/lib/settings/scoped_settings.rb Addition of a new “noindex” site-wide setting, conflict due to our change of the two other site-wide settings (default flavour and skin instead of theme) - spec/controllers/application_controller_spec.rb Addition of a new “noindex” site-wide setting, conflict due to our change of the two other site-wide settings (default flavour and skin instead of theme)
Diffstat (limited to 'package.json')
| -rw-r--r-- | package.json | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/package.json b/package.json index 895245eed..3cdd0abcb 100644 --- a/package.json +++ b/package.json @@ -69,7 +69,7 @@ "@babel/plugin-transform-react-jsx-self": "^7.2.0", "@babel/plugin-transform-react-jsx-source": "^7.5.0", "@babel/plugin-transform-runtime": "^7.5.5", - "@babel/preset-env": "^7.5.5", + "@babel/preset-env": "^7.6.0", "@babel/preset-react": "^7.0.0", "@babel/runtime": "^7.5.4", "@clusterws/cws": "^0.15.0", @@ -159,7 +159,7 @@ "stringz": "^2.0.0", "substring-trie": "^1.0.2", "terser-webpack-plugin": "^1.4.1", - "tesseract.js": "^2.0.0-alpha.13", + "tesseract.js": "^2.0.0-alpha.15", "throng": "^4.0.0", "tiny-queue": "^0.2.1", "uuid": "^3.1.0", @@ -181,7 +181,7 @@ "eslint-plugin-jsx-a11y": "~6.2.3", "eslint-plugin-promise": "~4.2.1", "eslint-plugin-react": "~7.14.3", - "jest": "^24.8.0", + "jest": "^24.9.0", "raf": "^3.4.1", "react-intl-translations-manager": "^5.0.3", "react-test-renderer": "^16.8.6", |