mirrors/zotero
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions
zotero/chrome/locale/en-US
History
Dan Stillman 3a9483070e Merge branch '3.0' 
Conflicts:
	chrome/content/zotero/tinymce/plugins/paste/editor_plugin.js
	chrome/content/zotero/xpcom/translation/translate_firefox.js
	chrome/content/zotero/zoteroPane.js
	install.rdf
	update.rdf
2012-11-01 22:14:08 -04:00
..
zotero Merge branch '3.0' 2012-11-01 22:14:08 -04:00