mirrors/zotero
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions
zotero/chrome
History
Dan Stillman 36c5dceff4 Merge branch '4.0' 
Conflicts:
	chrome/content/zotero/browser.js
	chrome/content/zotero/longTagFixer.js
	chrome/content/zotero/xpcom/schema.js
	chrome/content/zotero/xpcom/utilities.js
	chrome/content/zotero/xpcom/zotero.js
	install.rdf
	update.rdf
2014-07-15 22:17:27 -04:00
..
content Merge branch '4.0' 2014-07-15 22:17:27 -04:00
locale Merge locales from Transifex 2014-06-19 02:05:29 -04:00
skin/default/zotero Error report improvements 2014-05-26 20:07:41 -04:00