mirrors/zotero
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions
zotero/chrome
History
Dan Stillman aa730bb3bd Merge branch '4.0' 
Conflicts:
	chrome/content/zotero/fileInterface.js
	chrome/content/zotero/xpcom/translation/translate_item.js
	chrome/content/zotero/xpcom/utilities_internal.js
	chrome/content/zotero/zoteroPane.js
2015-05-23 18:26:32 -04:00
..
content Merge branch '4.0' 2015-05-23 18:26:32 -04:00
locale Merge branch '4.0' 2015-05-23 18:26:32 -04:00
skin/default/zotero Rename error/warning icons 2015-05-19 22:42:43 -04:00