Miguel Jacq 408aef3941 Fix conflicts introduced from new changes in master branch		2017-11-01 14:00:00 +11:00
..
contributing.md	Fix link to Download Mirrors	2017-09-11 21:11:33 -05:00
doc-guidelines.md	Various minor spelling and grammar fixes	2017-05-11 18:48:59 +10:00
getting-started.md	Move translatable pages into qubes-doc	2017-07-19 20:30:21 -05:00
intro.md	Move translatable pages into qubes-doc	2017-07-19 20:30:21 -05:00
reporting-bugs.md	more minor typo/grammar fixes	2017-05-12 15:58:22 +10:00
testing.md	Move pages on user-contributable areas to user docs	2017-03-20 18:39:04 -07:00
user-faq.md	Fix conflicts introduced from new changes in master branch	2017-11-01 14:00:00 +11:00