Dan Stillman 1ae71c3830 Merge branch '4.0'		2016-11-03 17:40:58 -04:00
..
content	Merge branch '4.0'	2016-11-03 17:40:58 -04:00
locale	Update locales from Transifex	2016-10-15 16:16:18 -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