Merge pull request #1123 from PhpMadman/patch-2

Update CONTRIBUTING.md
This commit is contained in:
Jérôme Nadaud committed 2013-12-11 02:46:12 -08:00
commit 850350c2a6
1 file changed
+1 -1
+1 -1
View File
@@ -1,7 +1,7 @@
Contributing Contributing
------------ ------------
PrestaShop is an open-source e-commerce solution - To contribute to our project, you can make pull requests on the bootstrap branch. PrestaShop is an open-source e-commerce solution - To contribute to our project, you can make pull requests on the 1.6 branch or to the 1.5 branch if you have a fix for the 1.5 versions.
If you need some help to make a [pull-request][1] If you need some help to make a [pull-request][1]
All contributions must respect [the coding norm][2] and [the commit norm][3] in your pull-request. All contributions must respect [the coding norm][2] and [the commit norm][3] in your pull-request.
All core files you commit in your pull request must have Open Software License (OSL 3.0) All core files you commit in your pull request must have Open Software License (OSL 3.0)