Simon Kornblith ed49b867ac Merge branch '3.0' ... Conflicts: chrome/content/zotero/locale/csl		2012-07-14 16:43:28 -04:00
..
content	Merge branch '3.0'	2012-07-14 16:43:28 -04:00
locale	Validate CSL styles on installation, and restructure Zotero.Styles.install() to use Q.	2012-07-10 02:46:57 -04:00
skin/default/zotero	Merge branch 'attachment-progress'	2012-06-10 21:56:15 -04:00