[Pkg-privacy-commits] [tails-installer] 11/12: Merge remote-tracking branch 'kurono/feature/9005-Improve-tails-installer' at commit 3b0e29fd0bd972e0241cd84278e4247ffccafa6d

[Ulrike Uhlig]

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

ulrike pushed a commit to annotated tag tails-installer_5.0.2
in repository tails-installer.

commit 5cfb4e6ff094604668d1bb0a489f5f3d2f865f97
Merge: 97a1326 3b0e29f
Author: anonym <anonym at riseup.net>
Date:   Fri Nov 10 15:54:09 2017 +0100

    Merge remote-tracking branch 'kurono/feature/9005-Improve-tails-installer' at commit 3b0e29fd0bd972e0241cd84278e4247ffccafa6d
    
    We skip commit 51b15fe237636f845c2230023a3eba393bfbf0c4 (the branch's
    current HEAD) since it conflicts with the fix for #14755 and is
    difficult to resolve without reintroducing #14755 or other errors.
    
    Refs: #14720
    Fix-committed: #14721, #14722, #14723

 data/tails-installer.ui |  2 +-
 tails_installer/gui.py  | 31 +++++++++++++++++--------------
 2 files changed, 18 insertions(+), 15 deletions(-)


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