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
..
pentesting	Fix conflicts introduced from new changes in master branch	2017-11-01 14:00:00 +11:00
templates	Merge branch 'master' into spelling-grammar-fixes	2018-02-10 16:46:43 +01:00
windows	Fix conflicts introduced from new changes in master branch	2017-11-01 14:00:00 +11:00
hvm.md	Merge branch 'master' into spelling-grammar-fixes	2018-02-10 16:46:43 +01:00
linux-hvm-tips.md	Explain how to boot with HVM kernel errors.	2017-04-19 23:27:01 +01:00
netbsd.md	Various minor spelling and grammar fixes	2017-05-11 18:48:59 +10:00
pentesting.md	Edit pentesting.md	2017-04-16 12:53:50 -07:00
reinstall-template.md	Update examples from fedora-24 to fedora-25	2017-07-29 21:21:25 -05:00
templates.md	templates 4.0 updates	2018-01-31 13:35:12 +00:00
windows.md	Fix typo	2018-01-25 22:05:57 -06:00