Dan Stillman 4384a8ecc2 Merge branch '4.0' ... Conflicts: chrome/content/zotero/xpcom/schema.js		2013-08-16 18:16:59 -04:00
..
content	Merge branch '4.0'	2013-08-16 18:16:59 -04:00
locale	Closes #311, Update RIS/Refer pref to mention BibTeX too	2013-08-06 16:32:02 -04:00
skin/default/zotero	Remove some unnecessary CSS	2013-07-16 03:22:24 -04:00