Dan Stillman 5d32fb90ea Merge branch '4.0' ... Conflicts: chrome/content/zotero/fileInterface.js chrome/content/zotero/overlay.js chrome/content/zotero/xpcom/schema.js chrome/content/zotero/xpcom/zotero.js chrome/content/zotero/zoteroPane.js install.rdf update.rdf		2013-11-24 16:08:46 -05:00
..
schema	Merge branch '4.0'	2013-11-24 16:08:46 -05:00
tinymce	Revert "Disable spellchecking in notes until it can be supported for real"	2013-08-09 11:44:34 -04: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
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	Use SQLite.jsm from Fx24 to fix hang in Fx25+	2013-08-22 13:08:35 -04:00