Dan Stillman 57116fa892 Merge branch '4.0' ... Conflicts: chrome/content/zotero/xpcom/collectionTreeView.js chrome/content/zotero/xpcom/libraryTreeView.js chrome/content/zotero/xpcom/zotero.js install.rdf update.rdf		2014-05-08 15:52:31 -04:00
..
zotero	Merge branch '4.0'	2014-05-08 15:52:31 -04:00
zotero-platform	Retina tree twisties for OS X	2014-04-28 03:52:18 -04:00