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
..
backup-emergency-restore-v2.md	Remove en/ from URLs (QubesOS/qubes-issues#1333)	2015-10-28 22:14:40 +00:00
backup-emergency-restore-v3.md	Remove en/ from URLs (QubesOS/qubes-issues#1333)	2015-10-28 22:14:40 +00:00
backup-emergency-restore-v4.md	backup format v4: add backup_id field	2016-10-25 21:49:17 +02:00
backup-restore.md	Merge branch 'master' into spelling-grammar-fixes	2018-02-10 16:46:43 +01:00
copy-from-dom0.md	Document how to copy info out of Dom0	2017-02-11 15:57:29 -05:00
copy-paste.md	theinvisiblethings.blogpost.com -> https://blog.invisiblethings.org	2017-05-03 14:37:27 +00:00
copying-files.md	Improve formatting	2018-01-18 20:19:21 -06:00
dispvm.md	Replace absolute with relative paths for Qubes URLs	2018-02-03 14:51:06 -06:00
full-screen-mode.md	Various minor spelling and grammar fixes	2017-05-11 18:48:59 +10:00
managing-appvm-shortcuts.md	more minor typo/grammar fixes	2017-05-12 10:12:02 +10:00
recording-optical-discs.md	Remove en/ from URLs (QubesOS/qubes-issues#1333)	2015-10-28 22:14:40 +00:00
software-update-dom0.md	Merge branch 'master' into spelling-grammar-fixes	2018-02-10 16:46:43 +01:00
software-update-vm.md	Merge branch 'master' into spelling-grammar-fixes	2018-02-10 16:46:43 +01:00
tips-and-tricks.md	Merge branch 'master' into spelling-grammar-fixes	2018-02-10 16:46:43 +01:00
usb.md	Merge branch 'master' into spelling-grammar-fixes	2018-02-10 16:46:43 +01:00