[Pkg-privacy-commits] [onionshare] 242/256: Merge branch 'mig5-add_help_button'

[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 8745ff179bc9019fd2078f4762f37074bf447883
Merge: b170ec5 e97d1e6
Author: Micah Lee <micah at micahflee.com>
Date:   Mon May 22 16:46:20 2017 -0700

    Merge branch 'mig5-add_help_button'

 onionshare_gui/settings_dialog.py | 11 +++++++++++
 share/locale/en.json              |  1 +
 2 files changed, 12 insertions(+)

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