Verified Commit c87b5d64 authored by Lorenzo Faletra's avatar Lorenzo Faletra

Merge branch 'dev' of git.parrotsec.org:parrot-organization/documentation into dev

parents c2a1d81f 8960cc99
......@@ -17,12 +17,24 @@ The collaboration consists in a friendly partnership where we help Caine in its
***
### FSecurity Academy
Emerging learning resource in Costa Rica that makes use of the Parrot system.
[About FSecurity Academy](https://www.fsecurityacademy.com/about/)
***
### Hack The Box
[Hack The Box](https://www.hackthebox.eu) is an online platform providing labs and challenges for cyber security training. Users can improve their penetration testing skills and exchange ideas and methodologies with thousands of people in the security field. By employing several social and gamification elements Hack The Box makes the learning experience fun and rewarding.
***
### Leaseweb Global B.V.
Leaseweb is a global Infrastructure-as-a-Service (IaaS) provider offering customers hosting solutions to boost their business while cutting costs.
### KNXSecurity
KNXSecurity is an Italian community dedicated to cyber security training that helps us by testing the beta images of Parrot before the final release.
......@@ -35,14 +47,6 @@ KNXSecurity is an Italian community dedicated to cyber security training that he
***
### FSecurity Academy
Emerging learning resource in Costa Rica that makes use of the Parrot system.
[About FSecurity Academy](https://www.fsecurityacademy.com/about/)
***
 
## __Mirrors__
......
......@@ -28,8 +28,9 @@ In this page we list contributors and members, past and present, who have contri
# Dev Team
| nickname | name | role(s) | email |
| ---------------- | --------------------- | --------------------------------------------------------------- | ---------------------------- |
| Andi | | Dev | |
| Andi | | Dev | |
| h0tw4t3r | | Dev <br> Forum Moderator <br> Tutorial Writer <br> Website contributor | h0tw4t3r at parrotsec dot org |
| Dm Knght | Nông Hoàng Tú | Dev <br> Forum Moderator <br> Tutorial writer | dmknght at protonmail dot com |
&nbsp;
# Community Team
......@@ -51,10 +52,9 @@ In this page we list contributors and members, past and present, who have contri
| Jeff | Jeff Szydel | Facebook admin <br> System Tester | jeff at parrotsec dot org |
| Zaphod BB | | Telegram Admin <br> Forum Moderator | |
| mastrobirraio | Pino Matranga | Web Team Leader <br> Italian Community Leader <br> Forum Moderator | |
| LulzRose | Kurt Bruggeman | | LulzRose@riseup.net |
| Dm knght | | Forum Moderator <br> Tutorial writer | |
| LulzRose | Kurt Bruggeman | | LulzRose at riseup dot net |
| KileXt | | Forum Moderator <br> Tutorial writer | |
| h0tw4t3r | | Forum Moderator <br> Tutorial Writer <br> Website contributor | |
&nbsp;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment