Skip to content
Snippets Groups Projects
Commit 3098d037 authored by segfault's avatar segfault
Browse files

Merge /home/amnesia/Persistent/tails into feature/5688-tails-server_user-pretest 

Conflicts:
	config/chroot_local-includes/usr/lib/python3.4/dist-packages/tails_server/gui/config_panel.py
parents 62d939d3 0683b13d
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment