From: Jeremy Benoist Date: Sun, 25 Nov 2018 08:58:18 +0000 (+0100) Subject: Merge remote-tracking branch 'origin/master' into 2.4 X-Git-Url: https://git.immae.eu/?p=github%2Fwallabag%2Fwallabag.git;a=commitdiff_plain;h=b878be4cc99fd4927c70b59386cf7a57b33bb381;hp=e673b54f702f274a087e4feff409663d9636e57b 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 --- 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,9 +8,15 @@ | Documentation | yes/no | Translation | yes/no | CHANGELOG.md | yes/no -| Fixed tickets | #... | License | MIT + +