Dan Stillman b0e37a38a2 Merge branch '4.0' ... Conflicts: chrome/content/zotero/xpcom/schema.js chrome/content/zotero/xpcom/translation/translate.js chrome/content/zotero/xpcom/zotero.js install.rdf update.rdf		2015-01-29 19:59:47 -05:00
..
content	Merge branch '4.0'	2015-01-29 19:59:47 -05:00
locale	Merge non-English strings from Transifex	2014-12-27 14:14:31 -05:00
skin/default/zotero	Right pane (item-pane) can be collapsed	2015-01-07 10:41:18 +01:00