Merge branch 'doc-develop' into 'master'

Doc: work is based on master; push to fork

See merge request framasoft/mobilizon!280
This commit is contained in:
Thomas Citharel 2019-10-16 17:23:51 +02:00
commit 6b2382c444
1 changed files with 2 additions and 2 deletions

View File

@ -178,10 +178,10 @@ Mobilizon can be developed locally. For instructions on how to do this, please s
#### How to make changes #### How to make changes
* Make your changes on a separate branch which includes an issue number e.g. `1234-some-new-feature` where 1234 is the issue number where the feature is documented. Make sure the branch is based on `develop`. * Make your changes on a separate branch which includes an issue number e.g. `1234-some-new-feature` where 1234 is the issue number where the feature is documented. Make sure the branch is based on `master`.
* Do not commit changes to files that are irrelevant to your feature or bugfix. * Do not commit changes to files that are irrelevant to your feature or bugfix.
* Use commit messages descriptive of your changes. * Use commit messages descriptive of your changes.
* Push to the upstream of your new branch. * Push to your own repository fork.
* Create a merge request at GitLab. * Create a merge request at GitLab.
#### Git commit messages #### Git commit messages