[Pkg-privacy-commits] [onionshare] 12/66: Merge branch 'eta' of https://github.com/garrettr/onionshare into garrettr-eta

[Ulrike Uhlig]

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

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

commit 3c3ea6faf373d6bafae68b7bc1c1a90304cf1733
Merge: 4c40b89 e9eed56
Author: Micah Lee <micah at micahflee.com>
Date:   Fri Feb 12 08:36:46 2016 -0800

    Merge branch 'eta' of https://github.com/garrettr/onionshare into garrettr-eta

 onionshare/helpers.py            | 40 ++++++++++++++++++
 onionshare_gui/downloads.py      | 91 +++++++++++++++++++++++++++-------------
 onionshare_gui/onionshare_gui.py |  2 +-
 3 files changed, 104 insertions(+), 29 deletions(-)


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