From 00916076184810b7724afce62c9aaf9984bc5674 Mon Sep 17 00:00:00 2001
From: rugk <rugk@posteo.de>
Date: Wed, 8 Feb 2017 09:29:31 +0100
Subject: [PATCH] :memo: Simplify isue & PR template

I saw GitHub's new TOS already address the contribution/licensing issue, so
that the checkbox is not necessary.
See https://help.github.com/articles/github-terms-of-service-draft/#5-license-grant-to-other-users
---
 .github/ISSUE_TEMPLATE.md        | 7 ++++---
 .github/PULL_REQUEST_TEMPLATE.md | 7 -------
 2 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
index 11df2f3..f8363e8 100644
--- a/.github/ISSUE_TEMPLATE.md
+++ b/.github/ISSUE_TEMPLATE.md
@@ -1,5 +1,5 @@
 <!-- Please have a look at our FAQ before submitting an issue: https://github.com/PrivateBin/PrivateBin/wiki/FAQ -->
-<!-- This is a template for an bug report. If you would like to suggest a feature, feel free to delete the part below. -->
+<!-- This is a template for a bug report. If you would like to suggest a feature, feel free to delete the part below. -->
 
 ## Steps to reproduce
 <!-- Tell us how to reproduce the problem. -->
@@ -18,8 +18,6 @@ Here you can add screenshots. If the issue is e.g. a client-side issue (= an iss
 If you have access to the server log files, also copy them here.
 -->
 
-* I can reproduce this issue on <https://privatebin.net>: Yes / No
-
 ## Basic information
 
 <!-- If you use a public server enter the address of it here. -->
@@ -36,3 +34,6 @@ If you have access to the server log files, also copy them here.
 
 <!-- The version of PrivateBin, if you use an unstable version paste the commit hash or the GitHub link to the commit here (you can get it by running `git rev-parse HEAD`) -->
 **PrivateBin version:**
+
+* I can reproduce this issue on <https://privatebin.net>: Yes / No
+
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index ebb33c4..32ada5b 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -1,12 +1,5 @@
 <!-- This is a template for your Pull Request. This are just some suggestions for you. You do not have to use all of them. -->
 
-<!-- **Attention:** Please tick this box to agree to release your code under the projects license. Otherwise your PR cannot be accepted. -->
-* [ ] I agree to release the changes in this PR under the Zlib/libpng license as shown in the  [LICENSE file](https://github.com/PrivateBin/PrivateBin/blob/master/LICENSE.md#zliblibpng-license-for-privatebin).
-
-<!-- Alternatively uncomment and tick this box to release your code under public domain:
-* [ ] To the extent possible under law, I have waived all copyright and related or neighboring rights to this PR and publish it as public domain.
--->
-
 <!-- If your PR fixes an issue, mention it here. You can also just copy the URL - GitHub will convert it for you.
 If this PR fixes several issues, please prepend each issue url/number with the word "fix"/"fixes" or "close"/"closes" as this automatically closes the issues you mentioned when the PR is merged.
 -->