Dan Stillman 384a547693 Merge branch '4.0' into api_syncing ... Conflicts: chrome/content/zotero/lookup.js		2015-04-15 00:56:25 -04:00
..
zotero	Merge branch '4.0' into api_syncing	2015-04-15 00:56:25 -04:00
zotero-platform	Set tree image height to 16px everywhere	2015-04-07 14:37:13 -04:00