suzanne.soy/zotero
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
Zotero is a free, easy-to-use tool to help you collect, organize, cite, and share your research sources.
5,372 Commits 11 Branches 258 Tags 98 MiB
JavaScript 97.2%
CSS 2%
HTML 0.4%
XSLT 0.3%
ee16d96f92
Go to file
Dan Stillman ee16d96f92 Merge branch '3.0' 
Conflicts:
	chrome/content/zotero/preferences/preferences.xul
	chrome/content/zotero/xpcom/storage/webdav.js
	chrome/locale/gl-ES/zotero/zotero.dtd
	chrome/locale/gl-ES/zotero/zotero.properties
	chrome/locale/zh-CN/zotero/zotero.dtd
	chrome/locale/zh-CN/zotero/zotero.properties
	install.rdf
	update.rdf
2013-02-16 05:07:59 -05:00
chrome Merge branch '3.0' 2013-02-16 05:07:59 -05:00
components Merge branch '3.0' 2013-02-04 07:02:38 -05:00
defaults/preferences Merge branch '3.0' 2013-01-26 00:29:08 -05:00
resource Merge branch '3.0' 2013-02-16 05:07:59 -05:00
styles@a482d1ea39 Update styles submodule 2013-02-07 01:20:53 -05:00
translators@23c54a2766 There is no keeping up with @adam3smith. 2013-02-08 02:03:02 -05:00
.gitmodules Add https://github.com/zotero/bundled-styles as submodule 2011-11-03 00:34:34 -04:00
chrome.manifest Merge branch '3.0' 2012-02-17 04:26:58 -05:00
COPYING Switch client code license to Affero GPL version 3 2011-05-18 18:34:22 +00:00
install.rdf Update repotime, submodules, and versions 2013-02-08 01:49:31 -05:00
update.rdf Update repotime, submodules, and versions 2013-02-08 01:49:31 -05:00