Dan Stillman 28601a4380 Merge branch '4.0'		2016-09-30 02:58:52 -04:00
..
content	Merge branch '4.0'	2016-09-30 02:58:52 -04:00
locale	Tweak text in sync-user-change warning	2016-09-28 00:00:02 -04:00
skin/default/zotero	Fix error on CR of child note, and show parent item title in merge pane	2016-07-07 05:18:02 -04:00