diff options
| author | Jeremy Benoist <jeremy.benoist@gmail.com> | 2018-11-25 09:58:18 +0100 |
|---|---|---|
| committer | Jeremy Benoist <jeremy.benoist@gmail.com> | 2018-11-25 09:58:18 +0100 |
| commit | b878be4cc99fd4927c70b59386cf7a57b33bb381 (patch) | |
| tree | 9a5186ead93b9f6114b5341a7713f614eb58f6ec /.github | |
| parent | e673b54f702f274a087e4feff409663d9636e57b (diff) | |
| parent | bffe65478de71113a16f6e7a7ef75845c9d61180 (diff) | |
| download | wallabag-b878be4cc99fd4927c70b59386cf7a57b33bb381.tar.gz wallabag-b878be4cc99fd4927c70b59386cf7a57b33bb381.tar.zst wallabag-b878be4cc99fd4927c70b59386cf7a57b33bb381.zip | |
Merge remote-tracking branch 'origin/master' into 2.4
# Conflicts:
# web/wallassets/baggy.js
# web/wallassets/manifest.json
# web/wallassets/material.css
# web/wallassets/material.js
Diffstat (limited to '.github')
| -rw-r--r-- | .github/PULL_REQUEST_TEMPLATE.md | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index 3885cc84..80d81ee3 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md | |||
| @@ -8,10 +8,16 @@ | |||
| 8 | | Documentation | yes/no | 8 | | Documentation | yes/no |
| 9 | | Translation | yes/no | 9 | | Translation | yes/no |
| 10 | | CHANGELOG.md | yes/no | 10 | | CHANGELOG.md | yes/no |
| 11 | | Fixed tickets | #... | ||
| 12 | | License | MIT | 11 | | License | MIT |
| 13 | 12 | ||
| 14 | <!-- | 13 | <!-- |
| 14 | Please list the issues your PR fixes using special keywords, see | ||
| 15 | https://help.github.com/articles/closing-issues-using-keywords/ | ||
| 16 | |||
| 17 | Fixes #… | ||
| 18 | --> | ||
| 19 | |||
| 20 | <!-- | ||
| 15 | - Please fill in this template according to the PR you're about to submit. | 21 | - Please fill in this template according to the PR you're about to submit. |
| 16 | - Replace this comment by a description of what your PR is solving. | 22 | - Replace this comment by a description of what your PR is solving. |
| 17 | --> | 23 | --> |