chore(merging-upstream): bunch of conflicts to solve

.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,40 @@
+---
+name: Bug report
+about: Create a report to help us improve
+title: ''
+labels: bug
+assignees: ''
+
+---
+
+**Describe the bug**
+
+A clear and concise description of what the bug is.
+
+**To reproduce**
+
+Steps to reproduce the behavior:
+1. Go to '...'
+2. Click on '....'
+3. Scroll down to '....'
+4. See error
+
+**Does this happen in the official app?**
+
+Does this issue also occur with the respective upstream release?
+> No / Yes
+
+> In case it does, please consider filing an [upstream bug report](https://github.com/mastodon/mastodon-android/issues) instead.
+> If this bug is seriously impacting your usage or you think I might want to try to fix it for Megalodon, feel free to still create this issue!
+
+**Screenshots and screen recordings**
+
+If applicable, add screenshots (and screen recordings, if possible) to help explain your problem.
+
+**Version**
+
+Moshidon version: [e.g. v1.1.4+fork.#]
+
+**Crash log**
+
+If you know your way around Android development tools, please consider attaching a crash log, if possible.