Merge branch 'kill-e4x'
Conflicts: chrome/content/zotero/xpcom/integration.js
This commit is contained in:
commit
57c3d190b4
7 changed files with 135 additions and 1590 deletions
|
@ -78,7 +78,6 @@ const xpcomFilesLocal = [
|
|||
'data/tags',
|
||||
'db',
|
||||
'duplicates',
|
||||
'enstyle',
|
||||
'fulltext',
|
||||
'id',
|
||||
'integration',
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue