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
..
zotero-autocomplete.js	Switch client code license to Affero GPL version 3	2011-05-18 18:34:22 +00:00
zotero-protocol-handler.js	- Fix failure to save snapshots, caused by failure to add and remove our request from loadGroup	2011-08-12 18:10:53 +00:00
zotero-service.js	Merge branch '3.0'	2011-12-17 16:25:58 -05:00