Marek Marczykowski-Górecki 919f2ed17e Merge branch 'master' into spelling-grammar-fixes ... Resolved conflicts in: basics_user/doc-guidelines.md basics_user/reporting-bugs.md common-tasks/backup-restore.md common-tasks/software-update-dom0.md common-tasks/software-update-vm.md common-tasks/usb.md configuration/disk-trim.md configuration/external-audio.md configuration/network-printer.md configuration/resize-disk-image.md configuration/resize-root-disk-image.md customization/fedora-minimal-template-customization.md managing-os/hvm.md managing-os/templates/archlinux.md privacy/whonix-install.md security/yubi-key.md troubleshooting/install-nvidia-driver.md troubleshooting/macbook-troubleshooting.md		2018-02-10 16:46:43 +01:00
..
anonymizing-your-mac-address.md	Merge branch 'master' into spelling-grammar-fixes	2018-02-10 16:46:43 +01:00
martus.md	Insignificantly edit martus.md	2017-04-17 12:56:54 -07:00
signal.md	add VM Settings -> Applications path	2018-02-03 13:36:52 +00:00
tails.md	Replace absolute with relative paths for Qubes URLs	2018-02-03 14:51:06 -06:00
torvm.md	Replace absolute with relative paths for Qubes URLs	2018-02-03 14:51:06 -06:00
whonix-customize.md	Clean up and organize privacy pages	2016-02-20 21:15:30 +00:00
whonix-install.md	Merge branch 'master' into spelling-grammar-fixes	2018-02-10 16:46:43 +01:00
whonix-uninstall.md	Clean up and organize privacy pages	2016-02-20 21:15:30 +00:00
whonix-update.md	Clean up and organize privacy pages	2016-02-20 21:15:30 +00:00
whonix.md	link to deprecated /doc/torvm	2018-02-03 13:23:34 +00:00