zotero/chrome/content
Simon Kornblith 91c3374d6b Merge branch '3.0' and modify recognizePDF.js to use promises
Conflicts:
	chrome/content/zotero/recognizePDF.js
	install.rdf
	update.rdf
2013-01-21 01:04:05 -05:00
..
zotero Merge branch '3.0' and modify recognizePDF.js to use promises 2013-01-21 01:04:05 -05:00
zotero-platform File sync overhaul 2012-12-11 15:16:40 -05:00