[Pkg-privacy-commits] [onionshare] 20/53: Merge branch 'master' of https://github.com/jvoisin/onionshare into jvoisin-master

[Ulrike Uhlig]

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

u-guest pushed a commit to branch debian
in repository onionshare.

commit 34591b5634bbec38d79acebff9684426485b5de4
Merge: ecb8128 ac97ddf
Author: Micah Lee <micah at micahflee.com>
Date:   Sun Nov 8 15:53:41 2015 -0800

    Merge branch 'master' of https://github.com/jvoisin/onionshare into jvoisin-master
    
    Conflicts:
    	onionshare/socks.py

 onionshare/onionshare.py |  5 +++--
 onionshare/strings.py    | 16 ++++++++--------
 onionshare/web.py        |  6 +++---
 setup.py                 |  2 +-
 4 files changed, 15 insertions(+), 14 deletions(-)


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