Miguel Jacq 408aef3941 Fix conflicts introduced from new changes in master branch		2017-11-01 14:00:00 +11:00
..
blackarch.md	Various minor spelling and grammar fixes	2017-05-11 18:48:59 +10:00
kali.md	Fix conflicts introduced from new changes in master branch	2017-11-01 14:00:00 +11:00
ptf.md	Various minor spelling and grammar fixes	2017-05-11 18:48:59 +10:00