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
..
contributing.md	Replace absolute with relative paths for Qubes URLs	2018-02-03 14:51:06 -06:00
doc-guidelines.md	Merge branch 'master' into spelling-grammar-fixes	2018-02-10 16:46:43 +01:00
getting-started.md	Fix link	2018-02-04 17:46:19 -06:00
intro.md	Update links to new FAQ (QubesOS/qubes-issues#2704)	2017-11-15 22:38:48 -06:00
reporting-bugs.md	Improve organization, clarify procedure, and clean up source	2018-01-31 22:31:03 -06:00
testing.md	Move pages on user-contributable areas to user docs	2017-03-20 18:39:04 -07:00