Dan Stillman 099b45438d Merge branch '4.0'		2016-06-13 23:02:22 -04:00
..
content	Merge branch '4.0'	2016-06-13 23:02:22 -04:00
locale	Update locales from Transifex	2016-06-09 02:43:37 -04:00
skin/default/zotero	Add a second horizontal layout to Zotero for small screens (#1010)	2016-05-27 20:57:29 -04:00