Skip to content

Commit

Permalink
Merge pull request #9554 from ttoine/develop
Browse files Browse the repository at this point in the history
Update links to use GitHub issues in README.md and CONTRIBUTING.md
  • Loading branch information
eternoendless committed Aug 22, 2018
2 parents 9dfbffa + 98b3a2b commit e1ed70f
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
6 changes: 3 additions & 3 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ The PrestaShop documentation features a thorough explanation of the [complete pr

If you don't feel comfortable forking the project or using Git, you can also either:
* Edit a file directly within GitHub: browse to the target file, click the "Edit" button, make your changes in the editor then click on "Propose File Change". Github will automatically create a new fork and branch on your own Github account, then suggest to create a pull request to PrestaShop. Once the pull request is submitted, you just have to wait for a core developer to answer you.
* Submit an issue using the Forge: [PrestaShop Forge][5] is the official ticket-tracker for PrestaShop, and the best place to write a bug ticket or request an improvement, while not having to be a developer at all. You will need to create an account on the Forge: [follow these instructions][6], then wait for our team to answer you.
* [Submit an issue using GitHub][5]: this is the official ticket-tracker for PrestaShop, and the best place to write a bug ticket or request an improvement, while not having to be a developer at all. You will need to [create an account on GitHub][6].

Thank you for your help in making PrestaShop even better!

Expand All @@ -42,8 +42,8 @@ Thank you for your help in making PrestaShop even better!
[2]: https://devdocs.prestashop.com/1.7/contribute/contribution-guidelines/
[3]: https://help.github.com/articles/using-pull-requests
[4]: http://doc.prestashop.com/display/PS16/Contributing+code+to+PrestaShop
[5]: http://forge.prestashop.com/
[6]: https://devdocs.prestashop.com/1.7/contribute/contribute-reporting-issues/
[5]: https://github.com/PrestaShop/PrestaShop/issues/new/choose
[6]: https://github.com/join
[7]: http://opensource.org/licenses/OSL-3.0
[8]: http://opensource.org/licenses/AFL-3.0

4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ Current Crowdin status (for 69 registered languages): [![Crowdin](https://crowdi
Reporting Issues
--------

Our bugtracker is called the Forge. We encourage you to [create detailed issues][create-issue] as soon as you see them.
Our bugtracker is on GitHub. We encourage you to [create detailed issues][create-issue] as soon as you see them.

Read our [Contribute by reporting issues guide][reporting-issues] for details and tips.

Expand Down Expand Up @@ -142,7 +142,7 @@ Thank you for downloading and using the PrestaShop Open Source e-commerce soluti
[system-requirements]: https://devdocs.prestashop.com/1.7/basics/installation/system-requirements/
[install-guide]: http://doc.prestashop.com/display/PS17/Installing+PrestaShop
[devdocs]: https://devdocs.prestashop.com/
[create-issue]: http://forge.prestashop.com/secure/CreateIssue%21default.jspa?selectedProjectId=11322&issuetype=1
[create-issue]: https://github.com/PrestaShop/PrestaShop/issues/new/choose
[reporting-issues]: https://devdocs.prestashop.com/1.7/contribute/contribute-reporting-issues/
[modules-devdocs]: https://devdocs.prestashop.com/1.7/modules/
[themes-devdocs]: https://devdocs.prestashop.com/1.7/themes/

0 comments on commit e1ed70f

Please sign in to comment.