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
..
code-of-conduct.md	Replace absolute with relative paths for Qubes URLs	2018-02-03 14:51:06 -06:00
download-mirrors.md	Create Mirrors page and link from Contributing and ToC	2017-09-10 18:49:04 -05:00
experts.md	Update Peter Todd's endorsement	2017-10-31 03:36:39 -05:00
faq.md	Merge branch 'master' into spelling-grammar-fixes	2018-02-10 16:46:43 +01:00
join.md	Move translatable pages into qubes-doc	2017-07-19 20:30:21 -05:00
mailing-lists.md	Add section on mailing list safety	2017-12-28 04:03:23 -06:00
research.md	Move translatable pages into qubes-doc	2017-07-19 20:30:21 -05:00
screenshots.md	Move translatable pages into qubes-doc	2017-07-19 20:30:21 -05:00
statistics.md	Move translatable pages into qubes-doc	2017-07-19 20:30:21 -05:00
video-tours.html	Move translatable pages into qubes-doc	2017-07-19 20:30:21 -05:00