diff options
author | Stefan Malzner <stefan@adlk.io> | 2017-11-05 20:57:10 +0100 |
---|---|---|
committer | Stefan Malzner <stefan@adlk.io> | 2017-11-05 20:57:10 +0100 |
commit | 9c73f2190be69a4b5bfa73c2f3110ad4f40d66d9 (patch) | |
tree | 2501ecf99eda11cdf9ed864e5b09f72d0c73815b | |
parent | Merge pull request #212 from meetfranz/feature/harden (diff) | |
parent | Merge pull request #213 from alecive/master (diff) | |
download | ferdium-app-9c73f2190be69a4b5bfa73c2f3110ad4f40d66d9.tar.gz ferdium-app-9c73f2190be69a4b5bfa73c2f3110ad4f40d66d9.tar.zst ferdium-app-9c73f2190be69a4b5bfa73c2f3110ad4f40d66d9.zip |
Merge branch 'master' into develop
-rw-r--r-- | .github/ISSUE_TEMPLATE.md | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md index 4ef48f240..c11a2994f 100644 --- a/.github/ISSUE_TEMPLATE.md +++ b/.github/ISSUE_TEMPLATE.md | |||
@@ -1,5 +1,7 @@ | |||
1 | <!--- Provide a general summary of the issue in the Title above --> | 1 | <!--- Provide a general summary of the issue in the Title above --> |
2 | 2 | ||
3 | <!-- This repository is only for the Franz client. Please use this form ( https://adlk.typeform.com/to/Bj7vGq ) for service requests or check out the guide ( https://github.com/meetfranz/plugins ) to create your own service integration. --> | ||
4 | |||
3 | <!--- If you want to propose a feature, use this template: https://raw.githubusercontent.com/meetfranz/franz/master/.github/FEATURE_PROPOSAL_TEMPLATE.md --> | 5 | <!--- If you want to propose a feature, use this template: https://raw.githubusercontent.com/meetfranz/franz/master/.github/FEATURE_PROPOSAL_TEMPLATE.md --> |
4 | 6 | ||
5 | ### Expected Behavior | 7 | ### Expected Behavior |