Dan Stillman 1117332177 Merge branch '4.0' ... Conflicts: chrome/content/zotero/xpcom/zotero.js		2013-08-03 18:12:36 -04:00
..
content	Merge branch '4.0'	2013-08-03 18:12:36 -04:00
locale	Add Firefox-wide shortcut (Ctrl/Cmd-Shift-S) for "Save to Zotero"	2013-07-31 23:19:19 -04:00
skin/default/zotero	Remove some unnecessary CSS	2013-07-16 03:22:24 -04:00