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
..
automated-tests.md	Significantly edit automated-tests.md	2017-04-17 11:38:25 -07:00
profiling.md	Consistently use the term "third-party"	2017-12-07 22:43:04 -06:00
safe-remote-ttys.md	Adjust headings for auto-ToC and uniformity	2016-11-22 03:03:51 -08:00
test-bench.md	Move all developer documentation to main index	2016-06-20 13:56:20 -07:00
vm-interface.md	Fix conflicts introduced from new changes in master branch	2017-11-01 14:00:00 +11:00
windows-debugging.md	Update windows-debugging.md	2017-05-03 09:55:28 +00:00