Dan Stillman d5b2f67afa Automatically resolve item deletion/trash conflicts ... If the item was deleted on one side and moved to the trash on the other, just delete the item on the trash side. Since trash emptying happens automatically, this would otherwise result in a conflict even if the user carefully avoided making changes before a manual sync.		2016-07-30 23:03:30 -04:00
..
zotero	Automatically resolve item deletion/trash conflicts	2016-07-30 23:03:30 -04:00
zotero-platform	Add a second horizontal layout to Zotero for small screens (#1010)	2016-05-27 20:57:29 -04:00