Merge branch 'master' into gh-3101

retorquere · Jan 9, 2025 · cca7d29 · cca7d29
2 parents 06a3997 + 49931b7
commit cca7d29
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 18 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -103,7 +103,7 @@
     "lodash.merge": "^4.6.2",
     "npm": "^11.0.0",
     "p-defer": "^4.0.1",
-    "papaparse": "^5.4.1",
+    "papaparse": "^5.5.0",
     "parse5": "^7.2.1",
     "pinyin": "^3.1.0",
     "promise.allsettled": "^1.0.7",
@@ -181,7 +181,7 @@
     "process": "^0.11.10",
     "properties-reader": "^2.3.0",
     "pug": "^3.0.3",
-    "putout": "^37.12.0",
+    "putout": "^37.13.0",
     "recast": "^0.23.9",
     "regenerate": "^1.4.2",
     "rimraf": "^6.0.1",

diff --git a/submodules/citation-style-language-locales b/submodules/citation-style-language-locales
diff --git a/submodules/zotero b/submodules/zotero
+1 −3		Gemfile.lock
+6 −3		locales-de-AT.xml
+11 −8		locales-de-CH.xml
+6 −3		locales-de-DE.xml
+94 −94		chrome/content/zotero/xpcom/data/dataObjectUtilities.js
+3 −3		chrome/content/zotero/xpcom/recognizeDocument.js
+98 −64		chrome/content/zotero/xpcom/sync/syncLocal.js
+1,238 −1,419		package-lock.json
+6 −6		package.json
+27 −0		test/tests/syncLocalTest.js