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
..
anti-evil-maid.md	Update anti-evil-maid.md	2017-05-03 10:04:52 +00:00
data-leaks.md	Revert "attacker emailing himself" sentence for clarity	2017-10-26 21:29:16 -05:00
firewall.md	Fix link	2018-02-06 01:38:31 -06:00
multifactor-authentication.md	multifactor-authentication update fedora version	2018-02-02 13:28:58 +00:00
security-guidelines.md	Merge branch 'master' into spelling-grammar-fixes	2018-02-10 16:46:43 +01:00
split-bitcoin.md	Fix conflicts introduced from new changes in master branch	2017-11-01 14:00:00 +11:00
split-gpg.md	split-gpg update package utilities	2018-02-02 13:40:40 +00:00
vm-sudo.md	Remove -n from echo	2018-01-11 16:57:38 -05:00
yubi-key.md	Merge branch 'master' into spelling-grammar-fixes	2018-02-10 16:46:43 +01:00