[Pkg-privacy-commits] [onionshare] 252/256: Merge branch 'fix_shutdown_from_gui' of https://github.com/mig5/onionshare into mig5-fix_shutdown_from_gui

[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 3e329b1bac91b204fa3b5a36212f056cc281d1f1
Merge: 19f2fca 3641f37
Author: Micah Lee <micah at micahflee.com>
Date:   Wed May 24 14:00:50 2017 -0700

    Merge branch 'fix_shutdown_from_gui' of https://github.com/mig5/onionshare into mig5-fix_shutdown_from_gui

 onionshare/web.py | 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/onionshare.git