mirrors/zotero
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
zotero/chrome
History
Dan Stillman 059460a5d2 Merge branch '3.0' 
Conflicts:
	chrome/content/zotero/xpcom/storage/webdav.js
	chrome/content/zotero/zoteroPane.js
	chrome/skin/default/zotero/preferences.css
2011-12-17 16:25:58 -05:00
..
content Merge branch '3.0' 2011-12-17 16:25:58 -05:00
locale Merge branch '3.0' 2011-12-17 16:25:58 -05:00
skin/default/zotero Merge branch '3.0' 2011-12-17 16:25:58 -05:00