[Pkg-privacy-commits] [onionshare] 07/256: Merge remote-tracking branch 'micahlee/master'
Ulrike Uhlig
ulrike at moszumanska.debian.org
Fri May 26 12:53:01 UTC 2017
This is an automated email from the git hooks/post-receive script.
ulrike pushed a commit to branch master
in repository onionshare.
commit 3b058f6392fc48bd762d1939c56a23cc660d2ec7
Merge: 7a8c5d9 373f24e
Author: Ulrike Uhlig <u at 451f.org>
Date: Wed Sep 7 15:31:43 2016 +0200
Merge remote-tracking branch 'micahlee/master'
CHANGELOG.md | 8 ++++++++
README.md | 8 ++++++++
onionshare/web.py | 23 ++++++++++++++---------
onionshare_gui/onionshare_gui.py | 19 +++++++++++--------
resources/version.txt | 2 +-
5 files changed, 42 insertions(+), 18 deletions(-)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-privacy/packages/onionshare.git
More information about the Pkg-privacy-commits
mailing list