scriptoriumadmin/zotero
1
0
Fork 0
mirror of https://github.com/zotero/zotero.git synced 2026-09-19 00:01:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3
Mirror of https://github.com/zotero/zotero.git
5351 commits 12 branches 402 tags 309 MiB
Find a file
Dan Stillman 0061ff3ca5 Merge branch '3.0' 
Conflicts:
	chrome/content/zotero/preferences/preferences.xul
	chrome/content/zotero/xpcom/data/item.js
	chrome/content/zotero/xpcom/utilities_translate.js
2013-02-04 07:02:38 -05:00
chrome Merge branch '3.0' 2013-02-04 07:02:38 -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 Update Q library 2012-12-11 03:30:47 -05:00
styles@90265e1171 Update styles 2012-11-18 23:29:58 -05:00
translators@a14697a41d Tweaks to getHiddenPref() 2013-01-25 22:40:14 -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' and modify recognizePDF.js to use promises 2013-01-21 01:04:05 -05:00
update.rdf Merge branch '3.0' and modify recognizePDF.js to use promises 2013-01-21 01:04:05 -05:00