zotero/resource
Dan Stillman 4caae896cf Merge branch '3.0'
Conflicts:
	chrome/content/zotero/xpcom/attachments.js
	chrome/content/zotero/xpcom/translation/translate_item.js
	install.rdf
	update.rdf
2012-11-23 01:49:32 -05:00
..
schema Merge branch '3.0' 2012-11-23 01:49:32 -05:00
csl-validator.js Add license to csl-validator.js 2012-07-10 20:00:16 -04:00
q.js Use methodjit... 2012-07-30 02:37:39 -04:00