Merge branch 'master' into dev

hugsy · Oct 26, 2018 · 17a5958 · 17a5958
2 parents d871e47 + dd43adc
commit 17a5958
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
@@ -22,8 +22,9 @@
 ### Checklist ###
 
 <!-- N.B.: Your patch won't be reviewed unless fulfilling the following base requirements: -->
-<!--- Put an `x` in all the boxes that apply. -->
+<!--- Put an `x` in all the boxes that are complete, or that don't apply -->
+- [ ] If my code is a bug fix it targets master, otherwise it targets dev.
 - [ ] My code follows the code style of this project.
 - [ ] My change includes a change to the documentation, if required.
-- [ ] My change adds tests as approriate.
+- [ ] My change adds tests as appropriate.
 - [ ] I have read and agree to the **CONTRIBUTING** document.