scriptoriumadmin/zotero
1
0
Fork 0
mirror of https://github.com/zotero/zotero.git synced 2026-10-03 02:21:49 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
Mirror of https://github.com/zotero/zotero.git
6198 commits 12 branches 404 tags 322 MiB
Find a file
Dan Stillman 60e5ab8124 Merge branch '4.0' 
Conflicts:
	chrome/content/zotero/xpcom/db.js
	chrome/content/zotero/xpcom/fulltext.js
	chrome/content/zotero/xpcom/zotero.js
	chrome/content/zotero/zoteroPane.js
	components/zotero-service.js
	install.rdf
	update.rdf
2014-04-08 18:47:32 -04:00
chrome Merge branch '4.0' 2014-04-08 18:47:32 -04:00
components Merge branch '4.0' 2014-04-08 18:47:32 -04:00
defaults/preferences Add pref to disable full-text syncing, and prompt existing users on sync 2013-11-05 05:04:51 -05:00
resource Merge branch '4.0' 2014-04-08 18:47:32 -04:00
styles@0a43882b3d Update versions, submodules, and repotime 2014-03-21 04:10:38 -04:00
translators@e035a0d4e4 Update versions, submodules, and repotime 2014-03-21 04:10:38 -04:00
.gitmodules Add https://github.com/zotero/bundled-styles as submodule 2011-11-03 00:34:34 -04:00
chrome.manifest Update locales from Transifex 2014-03-19 15:06:19 -04:00
COPYING Switch client code license to Affero GPL version 3 2011-05-18 18:34:22 +00:00
install.rdf Update versions 2014-03-24 16:50:58 -04:00
README.md Create README.md 2013-08-14 16:31:19 -04:00
update.rdf Update versions 2014-03-24 16:50:58 -04:00

README.md

Zotero

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

For more information on how to use this source code, see the Zotero wiki.