Verified Commit 3113da8d authored by Lorenzo Faletra's avatar Lorenzo Faletra

Merge branch 'master' of git.parrotsec.org:parrot-organization/parrotsec.org

parents 143ec9ed 23d620e2
<<<<<<< HEAD
2019/04/25
- Added KDE Security Editon and prepped for 4.6
......@@ -5,6 +6,8 @@
-s1udge
=======
>>>>>>> 23d620e2c0ce9547668562fa21be60cdc46ae395
2019/04/15
- Added CONTRIBUTING, contributors and CHANGELOG
......
......@@ -7,11 +7,16 @@ distributed by the Parrot Project, You reserve all right, title, and interest in
Your Contributions. All Contributions are subject to the following DCO + License
terms.
<<<<<<< HEAD
[DCO + Licenses](LICENSES.md)
=======
[DCO + License](https://nest.parrotsec.org/parrot-organization/community/blob/master/DCO_licenses.md)
>>>>>>> 23d620e2c0ce9547668562fa21be60cdc46ae395
_This notice should stay as the first item in the CONTRIBUTING.md file._
## Contributing
<<<<<<< HEAD
You can help improve our documentation by submitting merge requests (pull requests in github) to this repository.
......@@ -22,3 +27,15 @@ For more information about what please see our [Technical Guidelines for Contrib
We want to create a welcome environment for everyone who is interested in contributing. Please see our [Code of Conduct](https://nest.parrotsec.org/parrot-organization/community/blob/master/code-of-conduct.md) to learn more about our committment to an open environment.
You should get a response from a maintainer within three days for a merge request and seven days for everything else. If you haven't heard anything in that timeframe please ping the thread with the names of the maintainers.
=======
You can help improve parrotsec.org by submitting merge requests (pull requests in github) to this repository.
Thank you for your interest and help!
For more information about the technical guidelines please see our [Technical Guidelines for Contributing](https://nest.parrotsec.org/parrot-organization/community/blob/master/Tech-GL-4C.md).
And visit our [Code of Conduct](https://nest.parrotsec.org/parrot-organization/community/blob/master/code-of-conduct.md) to learn more about our committment to an open environment.
>>>>>>> 23d620e2c0ce9547668562fa21be60cdc46ae395
......@@ -22,7 +22,11 @@ See also the list of [contributors](contributors.md) who participated in this pr
## License
<<<<<<< HEAD
This project is licensed under the GPLv3 and CC-BY-SA v4.0 Licenses - see the [LICENSES.md].md](LICENSES.md) file for details.
=======
This project is licensed under the GPLv3 and CC-BY-SA v4.0 Licenses - see the [DCO_licenses.md](DCO_licenses.md) file for details.
>>>>>>> 23d620e2c0ce9547668562fa21be60cdc46ae395
## Acknowledgments
......
......@@ -13,7 +13,11 @@
</div><br/><br/><br/>
<div class="row">
<<<<<<< HEAD
<div class="col-lg-4 col-md-4 text-center">
=======
<div class="col-lg-4 col-md-4 col-md-offset-2 col-lg-offset-2 text-center">
>>>>>>> 23d620e2c0ce9547668562fa21be60cdc46ae395
<div class="panel download panel-blue">
<div class="panel-heading arrow_box text-center">
<h3>Live+Installer ISO</h3>
......@@ -42,6 +46,7 @@
</div>
<div class="col-lg-4 col-md-4 text-center">
<<<<<<< HEAD
<div class="panel download panel-blue">
<div class="panel-heading arrow_box text-center">
<h3>Live+Installer ISO</h3>
......@@ -64,6 +69,8 @@
</div>
<div class="col-lg-4 col-md-4 text-center">
=======
>>>>>>> 23d620e2c0ce9547668562fa21be60cdc46ae395
<div class="panel download panel-blue">
<div class="panel-heading arrow_box text-center">
<h3>Virtual Appliance</h3>
......
......@@ -95,7 +95,11 @@ $lang['download-29'] = 'Debian 10 Buster';
$lang['download-30'] = 'مدل انتشار';
$lang['download-31'] = 'انتشار رولینگ';
$lang['download-32'] = 'محیط دسکتاپ پیش فرض';
<<<<<<< HEAD
$lang['download-33'] = 'MATE 1.20/KDE Plasma';
=======
$lang['download-33'] = 'MATE 1.20';
>>>>>>> 23d620e2c0ce9547668562fa21be60cdc46ae395
$lang['download-34'] = 'Sandbox';
$lang['download-35'] = 'Office Suite';
$lang['download-36'] = 'LibreOffice 6.x';
......
......@@ -95,7 +95,11 @@ $lang['download-29'] = 'Debian 10 Buster';
$lang['download-30'] = 'Modelo de Lançamento';
$lang['download-31'] = 'Rolling Release';
$lang['download-32'] = 'Ambiente Desktop Padrão';
<<<<<<< HEAD
$lang['download-33'] = 'MATE 1,20/KDE Plasma';
=======
$lang['download-33'] = 'MATE 1,20';
>>>>>>> 23d620e2c0ce9547668562fa21be60cdc46ae395
$lang['download-34'] = 'Sandbox';
$lang['download-35'] = 'Office Suite';
$lang['download-36'] = 'LibreOffice 6.x';
......
......@@ -91,7 +91,11 @@ $lang['download-29'] = 'Debian 10 Buster';
$lang['download-30'] = 'Модель релиза';
$lang['download-31'] = 'Rolling Release';
$lang['download-32'] = 'Рабочее окружение по умолчанию';
<<<<<<< HEAD
$lang['download-33'] = 'MATE 1.20/KDE Plasma';
=======
$lang['download-33'] = 'MATE 1.20';
>>>>>>> 23d620e2c0ce9547668562fa21be60cdc46ae395
$lang['download-34'] = 'Sandbox';
$lang['download-35'] = 'Набор Office';
$lang['download-36'] = 'LibreOffice 6.x';
......
......@@ -95,7 +95,11 @@ $lang['download-29'] = 'Debian 10 Buster';
$lang['download-30'] = 'Yayın Modeli';
$lang['download-31'] = 'Rolling Release';
$lang['download-32'] = 'Varsayılan Masaüstü Ortamı';
<<<<<<< HEAD
$lang['download-33'] = 'MATE 1.20/KDE Plasma';
=======
$lang['download-33'] = 'MATE 1.20';
>>>>>>> 23d620e2c0ce9547668562fa21be60cdc46ae395
$lang['download-34'] = 'Sandbox';
$lang['download-35'] = 'Office Suite';
$lang['download-36'] = 'LibreOffice 6.x';
......
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