Skip to content
Blame History Permalink
  • Tails developers's avatar
    Merge remote-tracking branch 'origin/master' into devel · ecb75555
    Tails developers authored 
    Conflicts:
	config/binary_rootfs/squashfs.sort
	config/chroot_local-includes/usr/local/sbin/unsafe-browser
	debian/changelog
	features/i2p.feature

In the conflict resolution we move the update disabling parts of the
unsafe-browser script to its prefs file, which is the new home for
such configurations after the merge (into devel) of
bugfix/7951-refactor-chroot-browsers.
    ecb75555
To find the state of this project's repository at the time of any of these versions, check out the tags.