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
..
upgrade	Merge branch 'master' into spelling-grammar-fixes	2018-02-10 16:46:43 +01:00
custom-install.md	Write custom installation instructions	2016-11-26 04:16:49 -08:00
install-security.md	Update install-security.md	2017-05-03 14:43:40 +00:00
installation-guide.md	Merge branch 'patch-1' of https://github.com/NoobyNiceDev/qubes-doc into NoobyNiceDev-patch-1	2018-01-28 13:05:31 -06:00
live-usb.md	Merge branch 'master' into spelling-grammar-fixes	2018-02-10 16:46:43 +01:00
supported-versions.md	Fill supported templates for 3.2.1 and 4.0	2018-01-07 01:22:03 +01:00
version-scheme.md	Various minor spelling and grammar fixes	2017-05-11 18:48:59 +10:00