Merge branch 'master' of https://github.com/mailcow/mailcow-dockerized

.github/ISSUE_TEMPLATE/Bug_report.md

@@ -7,12 +7,11 @@ Immediate commercial support is available via mailcow@incidents.servercow.de
 **Describe the bug**
 A clear and concise description of what the bug is.
 
-**To Reproduce**
+**How to reproduce Reproduce**
-Steps to reproduce the behavior:
+Steps to reproduce the behavior please explain how to reproduce the bug:
-1. Go to '...'
+1. ....
-2. Click on '....'
+2. ....
-3. Scroll down to '....'
+3. ....
-4. See error
 
 **Expected behavior**
 A clear and concise description of what you expected to happen.
@@ -20,6 +19,9 @@ A clear and concise description of what you expected to happen.
 **Screenshots**
 If applicable, add screenshots to help explain your problem.
 
+**Logs**
+Please take a look at the [documentation](https://mailcow.github.io/mailcow-dockerized-docs/debug-logs/).
+
 **System**
  - OS: [e.g. iOS]
  - Browser: [e.g. chrome, safari]

.github/ISSUE_TEMPLATE/Feature_request.md

@@ -0,0 +1,14 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+
+---
+
+**Is your feature request related to a problem? Please describe.**
+A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+
+**Describe the solution you'd like**
+A clear and concise description of what you want to happen.
+
+**Additional context**
+Add any other context or screenshots about the feature request here or remove this section

data/Dockerfiles/netfilter/server.py

@@ -10,7 +10,6 @@ from random import randint
 from threading import Thread
 from threading import Lock
 import redis
-import time
 import json
 import iptc