Dan Stillman 0eb6dc9ca5 Merge branch '4.0'		2016-08-09 01:52:21 -04:00
..
content	Merge branch '4.0'	2016-08-09 01:52:21 -04:00
locale	Prompt to reset library data/files on loss of write access	2016-07-19 19:05:17 -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