mirrors/zotero
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
zotero/chrome
History
Dan Stillman ee16d96f92 Merge branch '3.0' 
Conflicts:
	chrome/content/zotero/preferences/preferences.xul
	chrome/content/zotero/xpcom/storage/webdav.js
	chrome/locale/gl-ES/zotero/zotero.dtd
	chrome/locale/gl-ES/zotero/zotero.properties
	chrome/locale/zh-CN/zotero/zotero.dtd
	chrome/locale/zh-CN/zotero/zotero.properties
	install.rdf
	update.rdf
2013-02-16 05:07:59 -05:00
..
content Merge branch '3.0' 2013-02-16 05:07:59 -05:00
locale Merge branch '3.0' 2013-02-16 05:07:59 -05:00
skin/default/zotero Make date parts indicator match order in date itself 2013-01-11 22:31:27 -05:00