scriptoriumadmin/zotero
1
0
Fork 0
mirror of https://github.com/zotero/zotero.git synced 2026-09-24 00:51:37 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3
zotero/chrome/content
History
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
..
zotero Merge branch '3.0' 2013-02-04 07:02:38 -05:00
zotero-platform File sync overhaul 2012-12-11 15:16:40 -05:00