[Pkg-privacy-commits] [onionshare] 31/55: Merge branch 'master' into cx_Freeze

[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 bba46e088f60b9ac5a7e2f4de1d96bf048932cf5
Merge: e2fb8b7 310d861
Author: Micah Lee <micah at micahflee.com>
Date:   Sun Sep 4 17:23:27 2016 -0700

    Merge branch 'master' into cx_Freeze

 README.md                        |  4 ++--
 SECURITY.md                      |  8 ++++----
 onionshare/hs.py                 | 34 +++++++++++++++++-----------------
 onionshare/onionshare.py         |  8 ++++----
 onionshare_gui/onionshare_gui.py |  6 +++---
 resources/locale/cs.json         | 18 +++++++++---------
 resources/locale/de.json         |  4 ++--
 resources/locale/en.json         | 16 ++++++++--------
 resources/locale/eo.json         | 12 ++++++------
 resources/locale/fr.json         |  6 +++---
 resources/locale/nl.json         |  6 +++---
 resources/locale/tr.json         |  2 +-
 12 files changed, 62 insertions(+), 62 deletions(-)


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