ee16d96f92
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
1 line
20 B
Text
1 line
20 B
Text
2013-02-08 07:00:00
|