Merge remote-tracking branch 'origin/master'

.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,37 @@
+---
+name: Bug report
+about: Create a report to help us improve
+title: '(Bug report)'
+labels: 'bug'
+assignees: ''
+
+---
+
+**Describe the bug**
+A clear and concise description of what the bug is.
+
+**Confirm that you have searched for existing issues in the issue tracker by adding an "x" between the brackets below**
+- [ ] I have searched for duplicate bugs in the issue tracker
+
+**To Reproduce**
+Steps to reproduce the behavior:
+1. Go to '...'
+2. Click on '....'
+3. Scroll down to '....'
+4. See error
+
+**Expected behavior**
+A clear and concise description of what you expected to happen.
+
+**Screenshots**
+If applicable, add screenshots to help explain your problem.
+
+**Platform (please complete the following information):**
+<!--Mac is unsupported as per https://github.com/zadam/trilium/wiki/FAQ#user-content-mac-os-support!!! -->
+ - What operating system?: [Windows, Linux]
+ - Are you using the standalone desktop version (no syncing)? Or the standalone server version (only accessing through the web browser)? Or a combination of server and desktop, where the desktop syncs to the server? 
+ - Version [e.g. 22]
+ - If you're using the server version, are you using the Docker or the binary from the releases page?
+
+**Additional context**
+Add any other context about the problem here. 

.github/ISSUE_TEMPLATE/feature_request.md

@@ -0,0 +1,23 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+title: '(Feature request)'
+labels: 'enhancement'
+assignees: ''
+
+---
+
+**Confirm that you have searched for existing issues in the issue tracker by adding an "x" between the brackets below**
+- [ ] I have searched for duplicate bugs in the issue tracker
+
+**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.
+
+**Describe alternatives you've considered**
+A clear and concise description of any alternative solutions or features you've considered.
+
+**Additional context**
+Add any other context or screenshots about the feature request here.