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
..
debian	Add instructions for disabling apt-daily.service in Stretch templates	2017-12-15 02:34:03 +00:00
fedora	Merge branch 'master' into spelling-grammar-fixes	2018-02-10 16:46:43 +01:00
archlinux.md	Merge branch 'master' into spelling-grammar-fixes	2018-02-10 16:46:43 +01:00
debian.md	Replace absolute with relative paths for Qubes URLs	2018-02-03 14:51:06 -06:00
fedora-minimal.md	Merge branch 'master' into spelling-grammar-fixes	2018-02-10 16:46:43 +01:00
fedora.md	Group version-specific documents together	2018-01-25 22:03:34 -06:00
ubuntu.md	Update ubuntu.md	2017-12-28 20:15:24 -05:00