[Pkg-privacy-commits] [onionshare] 17/55: Merge branch 'PabloCastellano-master'

[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 900276a5242c6ba5fc876efd83b1f0fe122ade29
Merge: 62e7035 7a895d4
Author: Micah Lee <micah at micahflee.com>
Date:   Fri Jun 10 17:29:44 2016 -0700

    Merge branch 'PabloCastellano-master'

 BUILD.md                       | 17 +++++++++++++++--
 install/scripts/onionshare     |  2 +-
 install/scripts/onionshare-gui |  2 +-
 3 files changed, 17 insertions(+), 4 deletions(-)

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