[Pkg-privacy-commits] [onionshare] 235/256: Merge branch '285_systray_notifications' of https://github.com/mig5/onionshare into mig5-285_systray_notifications

[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 02216f246bb00ebe996dfd387234531d703d667b
Merge: de4739e 3766a60
Author: Micah Lee <micah at micahflee.com>
Date:   Mon May 22 16:15:06 2017 -0700

    Merge branch '285_systray_notifications' of https://github.com/mig5/onionshare into mig5-285_systray_notifications

 onionshare/settings.py            |  1 +
 onionshare_gui/onionshare_gui.py  | 18 ++++++++++++++++++
 onionshare_gui/settings_dialog.py | 13 +++++++++++++
 share/locale/en.json              |  8 ++++++++
 4 files changed, 40 insertions(+)


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