Dan Stillman 9f9e95ea96 Show conflicts in debug output when showing CR window		2016-07-06 13:56:27 -04:00
..
zotero	Show conflicts in debug output when showing CR window	2016-07-06 13:56:27 -04:00
zotero-platform	Add a second horizontal layout to Zotero for small screens (#1010)	2016-05-27 20:57:29 -04:00