Public Git Hosting - tails-test.git/commit

summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
(merge: e14bfe1 524a8ea)

commit	4b72622297f8d41d4b5d81767f95558923e03c8c
author	Tails developers <amnesia@boum.org>
	Wed, 8 Oct 2014 15:04:33 +0000 (8 15:04 +0000)
committer	Tails developers <amnesia@boum.org>
	Wed, 8 Oct 2014 15:04:33 +0000 (8 15:04 +0000)
tree	3bb4e6fb1ac22e0bbd79d6efe76f0b776494ff34	tree \| snapshot (tar.gz zip)
parent	e14bfe1e1031848abc727bf14556579ecb95acd3	commit \| diff
parent	524a8ea4d50c890c4a2621fc61e7c5dba7885402	commit \| diff

Merge branch 'feature/tor-browser-bundle' into devel

Conflicts:
features/step_definitions/unsafe_browser.rb

config/chroot_apt/preferences	diff1 \|	diff2 \|	blob \| history
config/chroot_local-packageslists/tails-common.list	diff1 \|	diff2 \|	blob \| history
features/step_definitions/common_steps.rb	diff1 \|	diff2 \|	blob \| history
features/support/helpers/misc_helpers.rb	diff1 \|	diff2 \|	blob \| history
features/support/helpers/vm_helper.rb	diff1 \|	diff2 \|	blob \| history
features/usb_install.feature	diff1 \|	diff2 \|	blob \| history
run_test_suite	diff1 \|	diff2 \|	blob \| history
wiki/src/contribute/design.mdwn	diff1 \|	diff2 \|	blob \| history
wiki/src/contribute/release_process.mdwn	diff1 \|	diff2 \|	blob \| history
wiki/src/contribute/release_process/test.mdwn	diff1 \|	diff2 \|	blob \| history
wiki/src/support/faq.mdwn	diff1 \|	diff2 \|	blob \| history

tails mirror test with git rewrite