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
..
3.2	Merge branch 'master' into spelling-grammar-fixes	2018-02-10 16:46:43 +01:00
4.0	Reorganize and update CLI tool references pages for 4.0	2018-02-04 17:32:30 -06:00
tools-3.2.md	Reorganize and update CLI tool references pages for 4.0	2018-02-04 17:32:30 -06:00
tools-4.0.md	Reorganize and update CLI tool references pages for 4.0	2018-02-04 17:32:30 -06:00