Dan Stillman cd5e805b9e Sync logic improvements ... - Cancel sync when cancelling conflict resolution window - Don't try to upload unsynced objects if present in sync queue		2016-05-04 01:39:24 -04:00
..
content	Sync logic improvements	2016-05-04 01:39:24 -04:00
locale	Merge pull request #950 from adomasven/feature/import-feeds-from-opml	2016-04-28 01:09:47 -04:00
skin/default/zotero	Align "Set Up Syncing" button in prefs	2016-04-26 16:27:26 -04:00