mirrors/zotero
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
zotero/chrome
History
Dan Stillman ac195d2a5e Merge branch '3.0' 
Conflicts:
	chrome/content/zotero/integration/quickFormat.js
	chrome/content/zotero/xpcom/attachments.js
	chrome/content/zotero/xpcom/utilities.js
	install.rdf
	styles
	update.rdf
2012-11-20 03:22:49 -05:00
..
content Merge branch '3.0' 2012-11-20 03:22:49 -05:00
locale Merge branch '3.0' 2012-11-20 03:22:49 -05:00
skin/default/zotero Merge branch '3.0' 2012-09-10 17:18:08 -04:00