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
..
bind-dirs.md	Merge branch 'master' into spelling-grammar-fixes	2018-02-10 16:46:43 +01:00
dark-theme.md	More typo/grammar/re-wording from @jpouellet's review	2017-05-25 16:43:11 +10:00
dispvm-customization.md	Merge branch 'master' into spelling-grammar-fixes	2018-02-10 16:46:43 +01:00
fedora-minimal-template-customization.md	Merge branch 'master' into spelling-grammar-fixes	2018-02-10 16:46:43 +01:00
i3.md	Remove outdated configuration section	2016-09-29 06:26:51 -07:00
kde.md	Replace absolute with relative paths for Qubes URLs	2018-02-03 14:51:06 -06:00
language-localization.md	more minor typo/grammar fixes	2017-05-12 10:12:02 +10:00
windows-template-customization.md	More typo/grammar/re-wording from @jpouellet's review	2017-05-25 16:43:11 +10:00
xfce.md	Replace absolute with relative paths for Qubes URLs	2018-02-03 14:51:06 -06:00