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
5191 commits 12 branches 404 tags 323 MiB
Find a file
Simon Kornblith 585e5981f6 Merge branch '3.0' 
Conflicts:
	chrome/content/zotero/xpcom/storage/webdav.js
	chrome/content/zotero/xpcom/storage/zfs.js
2012-11-12 16:04:39 -05:00
chrome Merge branch '3.0' 2012-11-12 16:04:39 -05:00
components Merge branch '3.0' 2012-11-12 16:04:39 -05:00
defaults/preferences Merge branch '3.0' 2012-11-06 00:50:11 -05:00
resource Merge branch '3.0' 2012-11-12 16:04:39 -05:00
styles@1e8b58267a Update submodules 2012-11-06 01:25:46 -05:00
translators@fc00df4eec Merge branch '3.0' 2012-11-08 09:40:18 -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-01 22:14:08 -04:00
update.rdf Merge branch '3.0' 2012-11-01 22:14:08 -04:00