zotero/chrome/content
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
..
zotero Merge branch '4.0' 2013-11-24 16:08:46 -05:00
zotero-platform Tweak the tree row height a bit on Windows 2013-11-08 02:57:09 -05:00