Bruno 1fd6f813b9 Merge branch 'master' into i18n ... Conflicts: view/template/content/faq.php view/template/content/home.php view/template/content/news.php view/template/download/get.php view/template/page/learn.php view/template/page/publish.php view/template/page/team.php view/template/page/what.php		2016-07-21 15:35:29 -04:00
..
_joinList.php	Merge branch 'master' into i18n	2016-07-21 15:35:29 -04:00