Commit 8654eb6d authored by s1udge's avatar s1udge 💬

modified contributing and licenses. Fixed Readme

parent 232d8750
<<<<<<< HEAD
2019/04/25
- Added KDE Security Editon and prepped for 4.6
- Added LICENSES file
- Added LICENSE file
-s1udge
=======
>>>>>>> 23d620e2c0ce9547668562fa21be60cdc46ae395
2019/04/15
- Added CONTRIBUTING, contributors and CHANGELOG
......
......@@ -7,7 +7,7 @@ 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.
[DCO + Licenses](LICENSES.md)
[DCO + Licenses](LICENSE.md)
_This notice should stay as the first item in the CONTRIBUTING.md file._
......@@ -29,7 +29,7 @@ _Please do not use the issue tracker for support questions, please post on the [
## Maintainers, response time and security issues.
**Primary:** Palinuro
**Primary:** Palinuro <br>
**Alternate:** s1udge
You should get a response from a maintainer within **five days** for a merge request and **seven days** for everything else.
......@@ -39,6 +39,6 @@ After feedback is given we expect a response within two weeks if no response is
_Commit access is given on a case by case basis and is at the discretion of the Core Dev Team._
### How to suggest a feature or enhancement
Please make a post in the forum under development category. Please add why it is needed, the scope of the feature and any research you have.
Please make a post in the forum under the development category. Please add why it is needed, the scope of the feature and any research you have.
Your topic will be read and checked if the request is possible, if not you will be notified why this isn't possible.
If it is possible you will be asked to open an issue here.
......@@ -22,11 +22,7 @@ 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
This project is licensed under the GPLv3 and CC-BY-SA v4.0 Licenses - see the [LICENSE.md](LICENSE.md) file for details.
## Acknowledgments
......
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