[Pkg-privacy-commits] [onionshare] 14/66: Merge branch '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 191218d9436bc96d395f1e5aaecaf9f395056a8e
Merge: 4c40b89 41b3e6a
Author: Micah Lee <micah at micahflee.com>
Date:   Fri Feb 12 08:58:39 2016 -0800

    Merge branch 'garrettr-eta'

 locale/en.json                   |  5 ++-
 onionshare/helpers.py            | 40 ++++++++++++++++++
 onionshare_gui/downloads.py      | 91 +++++++++++++++++++++++++++-------------
 onionshare_gui/onionshare_gui.py |  2 +-
 4 files changed, 108 insertions(+), 30 deletions(-)

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