Dan Stillman 3d7a35addc Merge branch '4.0' ... Conflicts: chrome/content/zotero/xpcom/zotero.js install.rdf update.rdf		2014-09-08 20:24:44 -04:00
..
content	Merge branch '4.0'	2014-09-08 20:24:44 -04:00
locale	Merge locales from Transifex	2014-06-19 02:05:29 -04:00
skin/default/zotero	Use Mozilla's colors for itembox and tagbox background	2014-08-26 03:11:24 -05:00