[Pkg-anonymity-tools] [onionshare] 82/140: Merge branch 'deprecated' of https://github.com/lazlolazlolazlo/onionshare into lazlolazlolazlo-deprecated

[Ulrike Uhlig]

This is an automated email from the git hooks/post-receive script.

u-guest pushed a commit to branch master
in repository onionshare.

commit 65a7cf78cf3c114b03404495afdb918b3eeec1d6
Merge: c41dc68 a07bc73
Author: Micah Lee <micah at micahflee.com>
Date:   Wed Sep 3 14:06:41 2014 -0700

    Merge branch 'deprecated' of https://github.com/lazlolazlolazlo/onionshare into lazlolazlolazlo-deprecated
    
    Conflicts:
    	onionshare/strings.json

 onionshare/strings.json | 8 --------
 1 file changed, 8 deletions(-)


-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/collab-maint/onionshare.git