[Pkg-privacy-commits] [onionshare] 86/256: Merge branch 'master' into pyinstaller

[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 05319f7344640291a0568217d39b25b0a56af71d
Merge: d5af08c 7b068fe
Author: Micah Lee <micah at micahflee.com>
Date:   Tue Feb 21 17:13:06 2017 -0800

    Merge branch 'master' into pyinstaller

 apparmor/abstractions/onionshare | 18 ++++++++----------
 apparmor/usr.bin.onionshare      |  2 +-
 apparmor/usr.bin.onionshare-gui  |  8 +++++---
 share/locale/en.json             |  6 +++---
 4 files changed, 17 insertions(+), 17 deletions(-)


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