• Frédéric-Emmanuel Picca's avatar
    Merge remote-tracking branch 'upstream/master' · f326a162
    Frédéric-Emmanuel Picca authored
    # Conflicts:
    #	config-simple.hs
    #	contrib/post-merge-hook
    #	debian/changelog
    #	doc/README.mdwn
    #	joeyconfig.hs
    #	propellor.cabal
    #	src/Propellor/DotDir.hs
    #	src/Propellor/EnsureProperty.hs
    #	src/Propellor/Git.hs
    #	src/Propellor/Git/VerifiedBranch.hs
    #	src/Propellor/Property.hs
    #	src/Propellor/Property/Apt.hs
    #	src/Propellor/Property/Bootstrap.hs
    #	src/Propellor/Property/Cmd.hs
    #	src/Propellor/Property/DiskImage.hs
    #	src/Propellor/Property/DiskImage/PartSpec.hs
    #	src/Propellor/Property/Firewall.hs
    #	src/Propellor/Property/FlashKernel.hs
    #	src/Propellor/Property/Git.hs
    #	src/Propellor/Property/Gpg.hs
    #	src/Propellor/Property/Grub.hs
    #	src/Propellor/Property/Machine.hs
    #	src/Propellor/Property/Mount.hs
    #	src/Propellor/Property/Parted.hs
    #	src/Propellor/Property/Parted/Types.hs
    #	src/Propellor/Property/Sbuild.hs
    #	src/Propellor/Property/Scheduled.hs
    #	src/Propellor/Property/SiteSpecific/GitAnnexBuilder.hs
    #	src/Propellor/Property/SiteSpecific/JoeySites.hs
    #	src/Propellor/Property/Systemd.hs
    #	src/Propellor/Types/Bootloader.hs
    f326a162
Name
Last commit
Last update
..
README.Debian Loading commit data...
changelog Loading commit data...
compat Loading commit data...
control Loading commit data...
copyright Loading commit data...
lintian-overrides Loading commit data...
propellor.README.Debian Loading commit data...
rules Loading commit data...