Dan Stillman bdd69d0a53 Merge branch '4.0' into api_syncing		2015-03-16 23:41:10 -04:00
..
zotero	Merge branch '4.0' into api_syncing	2015-03-16 23:41:10 -04:00
zotero-platform	Fix size of separate Z toolbar icon on Windows and Linux	2015-03-09 03:37:40 -04:00