Luc Didry ff589e485f Merge branch 'duthils/lufi-fix-english' ... Conflicts: themes/default/lib/Lufi/I18N/en.po themes/default/lib/Lufi/I18N/fr.po themes/default/templates/mail.html.ep		2016-07-24 18:39:01 +02:00
..
default	Merge branch 'duthils/lufi-fix-english'	2016-07-24 18:39:01 +02:00