Dan Stillman c01fc5d762 Merge branch '4.0'		2016-08-28 03:37:55 -04:00
..
zotero	Merge branch '4.0'	2016-08-28 03:37:55 -04:00
zotero-platform	Add a second horizontal layout to Zotero for small screens (#1010)	2016-05-27 20:57:29 -04:00