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

Dan Stillman 4907489707 Revert "Extra debugging for file sync hangs on slow connections" ... This reverts commit 46cce5a2bd. Conflicts: chrome/content/zotero/xpcom/storage/streamListener.js		2013-07-22 02:35:53 -04:00
chrome	Revert "Extra debugging for file sync hangs on slow connections"	2013-07-22 02:35:53 -04:00
components	Restore ZFS quota warning	2013-07-08 20:13:47 -04:00
defaults/preferences	Merge pull request #316 from aurimasv/pref-defaults	2013-05-01 22:39:28 -07:00
resource	Update submodules and repotime	2013-07-22 02:29:17 -04:00
styles@c536a2c5c2	Update submodules and repotime	2013-07-22 02:29:17 -04:00
translators@10e7c43ed0	Update submodules and repotime	2013-07-22 02:29:17 -04:00
.gitmodules	Add https://github.com/zotero/bundled-styles as submodule	2011-11-03 00:34:34 -04:00
chrome.manifest	Add Indonesian locale	2013-05-17 14:43:26 -04:00
COPYING	Switch client code license to Affero GPL version 3	2011-05-18 18:34:22 +00:00
install.rdf	Update repotime, submodules, renamed styles, and versions	2013-07-11 23:21:28 -04:00
update.rdf	Update repotime, submodules, renamed styles, and versions	2013-07-11 23:21:28 -04:00