merge with upstream

This commit is contained in:
Jeepler 2016-06-15 18:58:33 -05:00
commit 7000514f47
9 changed files with 150 additions and 76 deletions

1
doc.md
View file

@ -63,6 +63,7 @@ Managing Operating Systems within Qubes
* [Templates: Archlinux](/doc/templates/archlinux/)
* [Templates: Ubuntu](/doc/templates/ubuntu/)
* [Templates: Whonix](/doc/whonix/)
* [How to Reinstall a TemplateVM](/doc/reinstall-template)
* [Pentesting: BlackArch](/doc/pentesting/blackarch/)
* [Pentesting: Kali](/doc/pentesting/kali/)
* [Pentesting: PTF](/doc/pentesting/ptf/)