Verified Commit 145045b6 authored by Lorenzo Faletra's avatar Lorenzo Faletra

Merge branch 'dev'

parents 82fe67a9 c87b5d64
......@@ -47,14 +47,6 @@ LTC: LR5Lxq2M5ijEgLryi6aNd2iFMpxT7pgEKL
----
## Ethereum
Ethereum Address
ETH: 0x64A449d5839813024861601720B173f562c8d3F8
----
## Merch
<html><a href="http://frozenbox.spreadshirt.net/" target="_blank" class="btn btn-primary">Spreadshirt Store</a></html>
......@@ -76,4 +68,4 @@ Even if we host most of our infrastructure on bare metal servers, some of our no
&nbsp;
[Using Parrot](https://www.parrotsec.org/docs/info/start/) | [Troubleshooting](https://www.parrotsec.org/docs/trbl/start/) | [Linux Beginner Guide](https://www.parrotsec.org/docs/library/lbg-basics/) | [Home](https://www.parrotsec.org/docs/)
\ No newline at end of file
[Using Parrot](https://www.parrotsec.org/docs/info/start/) | [Troubleshooting](https://www.parrotsec.org/docs/trbl/start/) | [Linux Beginner Guide](https://www.parrotsec.org/docs/library/lbg-basics/) | [Home](https://www.parrotsec.org/docs/)
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