Zotero is a free, easy-to-use tool to help you collect, organize, cite, and share your research sources.

Dan Stillman bfaa0f1172 Merge branch '4.0' ... Conflicts: chrome/content/zotero/xpcom/db.js chrome/content/zotero/xpcom/zotero.js install.rdf update.rdf		2013-08-08 01:06:35 -04:00
chrome	Merge branch '4.0'	2013-08-08 01:06:35 -04:00
components	Offer autocomplete of same creator for different creator types	2013-08-07 15:25:15 -04:00
defaults/preferences	Add Firefox-wide shortcut (Ctrl/Cmd-Shift-S) for "Save to Zotero"	2013-07-31 23:19:19 -04:00
resource	Update submodules, repotime, and versions	2013-08-06 15:23:04 -04:00
styles@d7eaec6c1e	Update submodules, repotime, and versions	2013-08-06 15:23:04 -04:00
translators@330bcfa0ab	Update submodules, repotime, and versions	2013-08-06 15:23:04 -04:00
.gitmodules	Add https://github.com/zotero/bundled-styles as submodule	2011-11-03 00:34:34 -04:00
chrome.manifest	Add Firefox-wide shortcut (Ctrl/Cmd-Shift-S) for "Save to Zotero"	2013-07-31 23:19:19 -04:00
COPYING	Switch client code license to Affero GPL version 3	2011-05-18 18:34:22 +00:00
install.rdf	Merge branch '4.0'	2013-08-08 01:06:35 -04:00
update.rdf	Merge branch '4.0'	2013-08-08 01:06:35 -04:00