[Pkg-privacy-commits] [onionshare] 234/256: Merge branch 'mig5-select_multiple_folders'

[Ulrike Uhlig]

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

ulrike pushed a commit to branch master
in repository onionshare.

commit de4739e4581d33cc111d8ec994574b0f714c20b2
Merge: f01bd30 e828b2f
Author: Micah Lee <micah at micahflee.com>
Date:   Mon May 22 16:11:06 2017 -0700

    Merge branch 'mig5-select_multiple_folders'

 onionshare_gui/file_selection.py | 36 +++++++++++++++++++++++++++---------
 share/locale/en.json             |  4 ++--
 share/locale/fr.json             |  4 ++--
 3 files changed, 31 insertions(+), 13 deletions(-)

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