Merge branch '4.0'

This commit is contained in:
Dan Stillman 2015-07-18 07:09:53 -04:00
commit 5c523d8694
112 changed files with 3659 additions and 1584 deletions

View file

@ -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