-
Tails developers authored
Conflicts: config/chroot_local-hooks/10-tbb In conflict resolution, also update to TBB 4.0 checksums and url in tbb-dist-url.txt and tbb-sha256sums.txt.
d749b48e
Conflicts: config/chroot_local-hooks/10-tbb In conflict resolution, also update to TBB 4.0 checksums and url in tbb-dist-url.txt and tbb-sha256sums.txt.