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
..
about.dtd	About pane updates	2011-12-14 17:52:10 -05:00
preferences.dtd	Merge branch '3.0'	2012-11-06 00:50:11 -05:00
searchbox.dtd	Fixes #111: "Search subcollections" instead of "Search subfolders" in Advanced search.	2012-05-03 17:35:49 -04:00
standalone.dtd	Add print and save options to reports, part 1	2012-04-19 00:12:43 -04:00
timeline.properties	Merged 1.0 branch back to trunk	2007-10-23 07:11:59 +00:00
zotero.dtd	Merge branch '3.0'	2013-02-04 07:02:38 -05:00
zotero.properties	Merge branch '3.0'	2013-02-16 05:07:59 -05:00