[Pkg-privacy-commits] [tails-installer] 07/17: Merge remote-tracking branch 'origin/master' into bugfix/15233-locale-fixes

[Ulrike Uhlig]

This is an automated email from the git hooks/post-receive script.

ulrike pushed a commit to branch tails/master
in repository tails-installer.

commit afa199b5f79df89d2a1ab1b1176a555cba80004f
Merge: 89aee80 65a09d8
Author: bertagaz <bertagaz at ptitcanardnoir.org>
Date:   Tue Feb 20 16:25:20 2018 +0100

    Merge remote-tracking branch 'origin/master' into bugfix/15233-locale-fixes

 po/fr.po | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-privacy/packages/tails-installer.git