[Pkg-privacy-commits] [onionshare] 106/256: Merge branch 'master' of github.com:micahflee/onionshare

[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 9ed7db9e3b999ba0de9d2c077e5e23e6a0148b5d
Merge: b2b4730 8f15aa1
Author: Micah Lee <micah at micahflee.com>
Date:   Thu Feb 23 15:11:36 2017 -0800

    Merge branch 'master' of github.com:micahflee/onionshare

 onionshare/__init__.py            |  2 +-
 onionshare/onion.py               | 23 +++++++++++++++++------
 onionshare/web.py                 |  9 ++++++++-
 onionshare_gui/__init__.py        |  2 +-
 onionshare_gui/settings_dialog.py |  4 ++--
 share/locale/en.json              |  3 ++-
 6 files changed, 31 insertions(+), 12 deletions(-)

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