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-signing.md	Update to guidelines, remove some parentheses	2017-04-16 12:36:17 -07:00
coding-style.md	Merge branch 'master' into spelling-grammar-fixes	2018-02-10 16:46:43 +01:00
devel-books.md	Improve book list	2017-07-05 22:25:50 -04:00
gsoc.md	Replace absolute with relative paths for Qubes URLs	2018-02-03 14:51:06 -06:00
license.md	"sign-off" procedure description has moved	2017-05-13 15:14:39 -04:00
package-contributions.md	Remove "unofficial" notice and fix typo	2017-11-14 21:15:14 -06:00
source-code.md	Be consistent.	2017-11-24 13:19:21 +01:00
style-guide.md	more minor typo/grammar fixes	2017-05-12 15:58:22 +10:00
system-doc.md
usability-ux.md	more minor typo/grammar fixes	2017-05-12 15:58:22 +10:00