Dan Stillman f0770fa84d Fix various conflict resolution bugs ... Among other things, when choosing the local side for a conflict, the remote version could still end up being saved.		2017-10-27 01:08:38 -04:00
..
content	Fix various conflict resolution bugs	2017-10-27 01:08:38 -04:00
locale	Update locales from Transifex	2017-10-25 23:55:12 -04:00
skin/default/zotero	Fixed 2x note column icon size	2017-10-19 02:54:19 -04:00