[Pkg-privacy-commits] [torbirdy] 01/17: Merge remote-tracking branch 'torbirdy-upstream/master'

Mon Sep 11 15:28:14 UTC 2017

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

ulrike pushed a commit to branch master
in repository torbirdy.

commit ef65fb067ff333c410114a431f9d6afdc9707514
Merge: d8fe3b4 0d99b04
Author: Ulrike Uhlig <u at 451f.org>
Date:   Wed Apr 19 12:12:20 2017 +0200

    Merge remote-tracking branch 'torbirdy-upstream/master'

 ChangeLog                     |  9 ++++++++-
 LICENSE                       |  2 +-
 README                        |  3 +--
 README.RELEASE                |  5 +++--
 chrome/content/emailwizard.js |  2 +-
 chrome/content/feedwizard.js  |  2 +-
 chrome/content/nntpwizard.js  |  2 +-
 chrome/content/overlay.js     |  1 +
 chrome/content/preferences.js | 15 +++++++++------
 components/torbirdy.js        | 14 ++++++--------
 defaults/preferences/prefs.js |  1 +
 gpg.conf                      |  2 +-
 install.rdf                   |  9 +++++----
 13 files changed, 39 insertions(+), 28 deletions(-)

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