scriptoriumadmin/zotero
1
0
Fork 0
mirror of https://github.com/zotero/zotero.git synced 2026-10-04 02:31:47 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
Mirror of https://github.com/zotero/zotero.git
4439 commits 12 branches 404 tags 323 MiB
Find a file
Dan Stillman 3a4401a995 Merge branch '3.0' 
Conflicts:
	chrome/content/zotero/xpcom/integration.js
	chrome/content/zotero/xpcom/storage/webdav.js
	chrome/content/zotero/xpcom/storage/zfs.js
	install.rdf
	update.rdf
2012-02-09 02:13:02 -05:00
chrome Merge branch '3.0' 2012-02-09 02:13:02 -05:00
components Merge branch '3.0' 2012-01-17 01:16:47 -05:00
defaults/preferences Merge branch '3.0' 2012-01-27 00:24:50 -05:00
resource/schema Merge branch '3.0' 2012-02-09 02:13:02 -05:00
scripts Adds rudimentary Zeroconf support to Zotero (a.k.a. "Z(ot)eroconf") 2008-06-03 05:26:30 +00:00
styles@a322796a08 Update styles pointer 2012-01-20 17:28:36 -05:00
translators@6dfbb188e4 Update submodule pointers 2012-01-20 17:03:38 -05:00
.gitmodules Add https://github.com/zotero/bundled-styles as submodule 2011-11-03 00:34:34 -04:00
chrome.manifest Don't unpack xpi 2012-01-29 15:15:23 -05:00
COPYING Switch client code license to Affero GPL version 3 2011-05-18 18:34:22 +00:00
install.rdf Don't unpack xpi 2012-01-29 15:15:23 -05:00
update.rdf Merge branch '3.0' 2012-02-09 02:13:02 -05:00