[Pkg-privacy-commits] [onionshare] 08/256: Merge branch 'master' of https://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 1d031739c562f92f86a17d49fa7ec7c2cb2ae179
Merge: 3b058f6 ae760a1
Author: Ulrike Uhlig <u at 451f.org>
Date:   Sat Nov 19 21:20:57 2016 +0100

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

 BUILD.md              | 2 +-
 CHANGELOG.md          | 5 +++++
 onionshare/helpers.py | 2 +-
 onionshare/onion.py   | 6 +++++-
 resources/version.txt | 2 +-
 5 files changed, 13 insertions(+), 4 deletions(-)

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