Simon Kornblith 48e6eb93de Merge pull request #779 from aurimasv/proper-to-proxy ... Fix properToProxy converter functions		2015-06-29 22:27:15 -04:00
..
content	Merge pull request #779 from aurimasv/proper-to-proxy	2015-06-29 22:27:15 -04:00
locale	Merge locales from Transifex	2015-06-29 07:12:55 -04:00
skin/default/zotero	Fix #773, Zotero combo icons dispersed under more tools	2015-06-29 05:59:19 -04:00