Skip to content
Commit 2f96f867 authored by intrigeri's avatar intrigeri
Browse files

Merge remote-tracking branch...

Merge remote-tracking branch 'origin/bugfix/8941-start-remote-shell-before-greeter' into feature/jessie-remote-shell-notify

Conflicts:
	config/chroot_local-hooks/52-update-rc.d
	config/chroot_local-includes/usr/local/lib/tails-autotest-remote-shell
	wiki/src/contribute/release_process/test/setup.mdwn
parents c7780668 e2693865
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment