Commit 1f033625 authored by Lorenzo Faletra's avatar Lorenzo Faletra

Merge branch 'dev' of dev.parrotsec.org:parrot/parrotsec.org into dev

parents 5e081ead d791929c
......@@ -23,7 +23,7 @@
<h3><?php echo $lang['download-home-5']; ?></h3>
</div>
<div class="panel-body text-center">
<p class="lead" style="font-size:40px"><strong>64BIT</strong></p>
<p class="lead" style="font-size:40px"><strong>64Bit</strong></p>
</div>
<ul class="list-group list-group-flush text-center">
<li class="list-group-item"><i class="icon-ok text-info"></i><?php echo $lang['download-home-6']; ?></li>
......@@ -52,7 +52,7 @@
<h3><?php echo $lang['download-home-5']; ?></h3>
</div>
<div class="panel-body text-center">
<p class="lead" style="font-size:40px"><strong>32BIT</strong></p>
<p class="lead" style="font-size:40px"><strong>32Bit</strong></p>
</div>
<ul class="list-group list-group-flush text-center">
<li class="list-group-item"><i class="icon-ok text-info"></i><?php echo $lang['download-home-13']; ?></li>
......
......@@ -55,7 +55,7 @@
</ul>
<div class="panel-footer">
<a class="btn btn-lg btn-block btn-info" target="_blank" href="https://cdimage.parrotsec.org/parrot/iso/4.2.2/Parrot-netinst-4.2.2_amd64.iso">netinstall amd64</a><br>
<a class="btn btn-lg btn-block btn-info" target="_blank" href="https://cdimage.parrotsec.orgparrot/iso/4.2.2/Parrot-netinst-4.2.2_i386.iso">netinstall i386</a><br>
<a class="btn btn-lg btn-block btn-info" target="_blank" href="https://cdimage.parrotsec.org/parrot/iso/4.2.2/Parrot-netinst-4.2.2_i386.iso">netinstall i386</a><br>
<a class="btn btn-lg btn-block btn-info" target="_blank" href="https://cdimage.parrotsec.org/parrot/dists/stable/main/installer-arm64/current/images/">netinstall arm64</a><br>
<a class="btn btn-lg btn-block btn-info" target="_blank" href="https://cdimage.parrotsec.org/parrot/dists/stable/main/installer-armhf/current/images/">netinstall armhf</a><br>
</div>
......
......@@ -125,4 +125,14 @@
</ul>
</div>
</div>
<<<<<<< HEAD
<<<<<<< HEAD
</nav>';
?>
=======
</nav>
>>>>>>> dev
=======
</nav>
>>>>>>> dev
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