master #12

Merged
NO11 merged 149 commits from VoxeLibre/VoxeLibre:master into master 2021-11-12 22:46:33 +01:00
1 changed files with 0 additions and 1 deletions
Showing only changes of commit 5c55ddff1e - Show all commits

View File

@ -81,7 +81,6 @@ If your code leads to bugs or crashes after being merged, it is your responsibil
* Fork the repository (in case you have not already) * Fork the repository (in case you have not already)
* Do your change in a new branch * Do your change in a new branch
* Create a pull request to get your changes merged into master * Create a pull request to get your changes merged into master
<<<<<<< HEAD
* Keep your pull request up to date by regulary merging upstream * Keep your pull request up to date by regulary merging upstream
* After the pull request got merged, you can delete the branch * After the pull request got merged, you can delete the branch