Dan Stillman 21d3ca298b Merge branch '4.0'		2016-09-18 18:39:18 -04:00
..
content	Merge branch '4.0'	2016-09-18 18:39:18 -04:00
locale	Update locales from Transifex	2016-09-06 19:32:07 -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