[Pkg-privacy-commits] [onionshare] 29/256: Merge branch 'eightnoteight-master'

[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 4db66a860a1a8ccb559c631a4b7c77698cd41b70
Merge: a67a037 eb00a29
Author: Micah Lee <micah at micahflee.com>
Date:   Thu Dec 22 16:00:51 2016 -0800

    Merge branch 'eightnoteight-master'

 onionshare/helpers.py            | 11 ++++++-
 onionshare/web.py                |  4 +--
 onionshare_gui/onionshare_gui.py | 70 ++++++++++++++++++++++++++++++++++++++--
 resources/locale/cs.json         |  4 ++-
 resources/locale/en.json         |  3 +-
 resources/locale/eo.json         |  3 +-
 resources/locale/fi.json         |  3 +-
 resources/locale/it.json         |  5 +--
 resources/locale/nl.json         |  3 +-
 resources/locale/tr.json         |  3 +-
 10 files changed, 95 insertions(+), 14 deletions(-)

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