scriptoriumadmin/zotero
1
0
Fork 0
mirror of https://github.com/zotero/zotero.git synced 2026-09-17 23:51:18 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3
Mirror of https://github.com/zotero/zotero.git
5228 commits 12 branches 402 tags 308 MiB
Find a file
Dan Stillman 4caae896cf Merge branch '3.0' 
Conflicts:
	chrome/content/zotero/xpcom/attachments.js
	chrome/content/zotero/xpcom/translation/translate_item.js
	install.rdf
	update.rdf
2012-11-23 01:49:32 -05:00
chrome Merge branch '3.0' 2012-11-23 01:49:32 -05:00
components Merge branch '3.0' 2012-11-23 01:49:32 -05:00
defaults/preferences Merge branch '3.0' 2012-11-06 00:50:11 -05:00
resource Merge branch '3.0' 2012-11-23 01:49:32 -05:00
styles@90265e1171 Update styles 2012-11-18 23:29:58 -05:00
translators@2c33d5d461 Update translators and repotime 2012-11-22 23:28:25 -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 Merge branch '3.0' 2012-11-23 01:49:32 -05:00
update.rdf Update versions 2012-11-22 16:40:23 -05:00