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
..
content	Merge branch '4.0'	2013-11-24 16:08:46 -05:00
locale	"back up and delete" -> "remove"	2013-11-21 20:25:14 -05:00
skin/default/zotero	Apply Fx25 tree-row fix to Windows only, and fix spacing there too	2013-11-07 03:23:55 -05:00