zotero/components
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
..
zotero-autocomplete.js Offer autocomplete of same creator for different creator types 2013-08-07 15:25:15 -04:00
zotero-protocol-handler.js Remove redundant line 2013-03-18 20:33:09 -04:00
zotero-service.js Merge branch '4.0' 2014-04-08 18:47:32 -04:00