Dan Stillman 196e45c849 Fix file conflict resolution after f0770fa84d ... merge.xul now returns an object with .data and .selected instead of returning .data directly		2017-10-27 04:07:35 -04:00
..
content	Fix file conflict resolution after f0770fa84d	2017-10-27 04:07:35 -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