Dan Stillman 60e5ab8124 Merge branch '4.0' ... Conflicts: chrome/content/zotero/xpcom/db.js chrome/content/zotero/xpcom/fulltext.js chrome/content/zotero/xpcom/zotero.js chrome/content/zotero/zoteroPane.js components/zotero-service.js install.rdf update.rdf		2014-04-08 18:47:32 -04:00
..
schema	Merge branch '4.0'	2014-04-08 18:47:32 -04:00
tinymce	fix copy/paste of non-http links in Notes	2014-02-05 19:09:15 +01:00
concurrent-caller.js	Remove errant letter	2013-08-21 01:03:10 -04:00
csl-validator.js	Use latest csl-validator	2013-03-23 17:30:34 -04:00
log4moz.js	Bundle log4moz.js, which is needed by Fx24 Sqlite.jsm and was removed from Fx	2014-01-14 19:24:32 -05:00
q.js	Revert q.js change that broke Q.async(function() { var x = yield y });	2013-08-18 03:29:39 -04:00
Sqlite.jsm	Bundle log4moz.js, which is needed by Fx24 Sqlite.jsm and was removed from Fx	2014-01-14 19:24:32 -05:00