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 1 additions and 1 deletions
Showing only changes of commit fb2a501a9c - Show all commits

View File

@ -242,7 +242,7 @@ of the results)
* [Official Minecraft Wiki](https://minecraft.fandom.com/wiki/Minecraft_Wiki)
(Include a link to the specific page you used)
### Keep our guidelines
### Stick to our guidelines
#### Git Guidelines
* We use merge rather than rebase or squash merge