Abe Jellinek a5393ca0e5 Merge: Keep external annotations on master, don't erase on other ... PDFWorker only re-imports external annotations when the file changes on disk. Keep annotation items corresponding to external annotations so that they don't disappear after the merge (and then come back when the file is edited). Tweaks behavior introduced in 2aa34a6. https://forums.zotero.org/discussion/113943/zotero-7-beta-merging-pdf-files-leaves-ghost-external-annotations		2024-04-25 16:35:09 -04:00
..
components	Switch back to @mozilla.org/browser/clh;1 and fix tests	2023-05-24 08:21:16 -04:00
content	Return baseURL from startHTTPServer() test support function	2024-04-20 06:41:57 -04:00
resource	fx-compat: Update httpd.js from mozilla-central 1739f130	2022-06-17 20:24:43 -04:00
tests	Merge: Keep external annotations on master, don't erase on other	2024-04-25 16:35:09 -04:00
chrome.manifest	fx115: Restore test runner	2024-03-30 00:58:53 -04:00
runtests.sh	Fix --openssl-legacy-provider issue when tests need to build reader	2023-08-09 07:27:22 -04:00