Merge branch '4.0'
This commit is contained in:
commit
5c523d8694
112 changed files with 3659 additions and 1584 deletions
|
@ -226,6 +226,7 @@ function makeZoteroContext(isConnector) {
|
|||
|
||||
// Load CiteProc into Zotero.CiteProc namespace
|
||||
zContext.Zotero.CiteProc = {"Zotero":zContext.Zotero};
|
||||
subscriptLoader.loadSubScript("chrome://zotero/content/xpcom/citeproc-prereqs.js", zContext.Zotero.CiteProc);
|
||||
subscriptLoader.loadSubScript("chrome://zotero/content/xpcom/citeproc.js", zContext.Zotero.CiteProc);
|
||||
|
||||
// Load XRegExp object into Zotero.XRegExp
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue