[Pkg-privacy-commits] [onionshare] 43/53: Merge branch 'slug_decorator' of https://github.com/pwplus/onionshare into pwplus-slug_decorator

[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 9d1abf668a1238ed485c16dee45a0df953941c3b
Merge: f2389cc 42d7dd4
Author: Micah Lee <micah at micahflee.com>
Date:   Fri Dec 4 12:46:51 2015 -0800

    Merge branch 'slug_decorator' of https://github.com/pwplus/onionshare into pwplus-slug_decorator

 onionshare/web.py | 29 +++++++++++++++++------------
 1 file changed, 17 insertions(+), 12 deletions(-)


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