Dan Stillman ed46414502 Merge branch '4.0'		2016-09-27 02:12:12 -04:00
..
content	Merge branch '4.0'	2016-09-27 02:12:12 -04:00
locale	Sync pane caption: "Zotero Data Sync" -> "Data Syncing"	2016-09-24 02:29:20 -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