Merge branch 'main'

# Conflicts:
#	README.md
#	mastodon/build.gradle
#	mastodon/src/github/java/org/joinmastodon/android/updater/GithubSelfUpdaterImpl.java
#	mastodon/src/main/java/org/joinmastodon/android/GlobalUserPreferences.java
#	mastodon/src/main/java/org/joinmastodon/android/MainActivity.java
#	mastodon/src/main/java/org/joinmastodon/android/PushNotificationReceiver.java
#	mastodon/src/main/java/org/joinmastodon/android/api/requests/notifications/DismissNotification.java
#	mastodon/src/main/java/org/joinmastodon/android/fragments/ComposeFragment.java
#	mastodon/src/main/java/org/joinmastodon/android/fragments/HomeFragment.java
#	mastodon/src/main/java/org/joinmastodon/android/fragments/HomeTimelineFragment.java
#	mastodon/src/main/java/org/joinmastodon/android/fragments/NotificationsListFragment.java
#	mastodon/src/main/java/org/joinmastodon/android/fragments/PinnableStatusListFragment.java
#	mastodon/src/main/java/org/joinmastodon/android/fragments/ProfileFragment.java
#	mastodon/src/main/java/org/joinmastodon/android/fragments/ScheduledStatusListFragment.java
#	mastodon/src/main/java/org/joinmastodon/android/fragments/SettingsFragment.java
#	mastodon/src/main/java/org/joinmastodon/android/fragments/StatusEditHistoryFragment.java
#	mastodon/src/main/java/org/joinmastodon/android/fragments/StatusListFragment.java
#	mastodon/src/main/java/org/joinmastodon/android/fragments/discover/DiscoverFragment.java
#	mastodon/src/main/java/org/joinmastodon/android/fragments/discover/LocalTimelineFragment.java
#	mastodon/src/main/java/org/joinmastodon/android/fragments/discover/SearchFragment.java
#	mastodon/src/main/java/org/joinmastodon/android/fragments/onboarding/AccountActivationFragment.java
#	mastodon/src/main/java/org/joinmastodon/android/fragments/onboarding/CustomWelcomeFragment.java
#	mastodon/src/main/java/org/joinmastodon/android/fragments/onboarding/InstanceRulesFragment.java
#	mastodon/src/main/java/org/joinmastodon/android/fragments/onboarding/SignupFragment.java
#	mastodon/src/main/java/org/joinmastodon/android/fragments/report/ReportAddPostsChoiceFragment.java
#	mastodon/src/main/java/org/joinmastodon/android/model/TranslatedStatus.java
#	mastodon/src/main/java/org/joinmastodon/android/ui/AccountSwitcherSheet.java
#	mastodon/src/main/java/org/joinmastodon/android/ui/M3AlertDialogBuilder.java
#	mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/FooterStatusDisplayItem.java
#	mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/HeaderStatusDisplayItem.java
#	mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/LinkCardStatusDisplayItem.java
#	mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/PhotoStatusDisplayItem.java
#	mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/StatusDisplayItem.java
#	mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/TextStatusDisplayItem.java
#	mastodon/src/main/java/org/joinmastodon/android/ui/text/ClickableLinksDelegate.java
#	mastodon/src/main/java/org/joinmastodon/android/ui/text/LinkSpan.java
#	mastodon/src/main/java/org/joinmastodon/android/ui/utils/ColorPalette.java
#	mastodon/src/main/java/org/joinmastodon/android/ui/utils/UiUtils.java
#	mastodon/src/main/java/org/joinmastodon/android/utils/StatusFilterPredicate.java
#	mastodon/src/main/res/color/button_bg_secondary_dark_on_light.xml
#	mastodon/src/main/res/color/button_text_primary_light_on_dark.xml
#	mastodon/src/main/res/drawable/ic_fluent_arrow_forward_24_regular.xml
#	mastodon/src/main/res/drawable/ic_fluent_arrow_repeat_all_24_very_filled.xml
#	mastodon/src/main/res/drawable/ic_fluent_chat_24_filled.xml
#	mastodon/src/main/res/drawable/ic_fluent_chat_multiple_24_regular_text.xml
#	mastodon/src/main/res/drawable/ic_fluent_eye_24_regular.xml
#	mastodon/src/main/res/drawable/ic_fluent_send_24_regular.xml
#	mastodon/src/main/res/drawable/ic_fluent_translate_24_regular.xml
#	mastodon/src/main/res/layout/compose_action.xml
#	mastodon/src/main/res/layout/display_item_footer.xml
#	mastodon/src/main/res/layout/fragment_compose.xml
#	mastodon/src/main/res/layout/fragment_profile.xml
#	mastodon/src/main/res/layout/header_welcome_custom.xml
#	mastodon/src/main/res/layout/item_list_header_simple.xml
#	mastodon/src/main/res/layout/item_settings_text.xml
#	mastodon/src/main/res/layout/item_settings_update.xml
#	mastodon/src/main/res/layout/item_text.xml
#	mastodon/src/main/res/layout/recycler_fragment_with_fab.xml
#	mastodon/src/main/res/menu/color_palettes.xml
#	mastodon/src/main/res/menu/post.xml
#	mastodon/src/main/res/menu/profile.xml
#	mastodon/src/main/res/menu/profile_own.xml
#	mastodon/src/main/res/values-fr-rFR/strings_sk.xml
#	mastodon/src/main/res/values-in-rID/strings_sk.xml
#	mastodon/src/main/res/values-pl-rPL/strings_sk.xml
#	mastodon/src/main/res/values-ru-rRU/strings_sk.xml
#	mastodon/src/main/res/values-uk-rUA/strings_sk.xml
#	mastodon/src/main/res/values-v31/colors.xml
#	mastodon/src/main/res/values/attrs.xml
#	mastodon/src/main/res/values/colors.xml
#	mastodon/src/main/res/values/ids.xml
#	mastodon/src/main/res/values/palettes.xml
#	mastodon/src/main/res/values/strings.xml
#	mastodon/src/main/res/values/strings_sk.xml
#	mastodon/src/main/res/values/styles.xml
#	metadata/ca/changelogs/50.txt
#	metadata/ca/changelogs/51.txt
#	metadata/ca/full_description.txt
#	metadata/de-DE/full_description.txt
#	metadata/en-US/changelogs/50.txt
#	metadata/en-US/changelogs/51.txt
#	metadata/en-US/changelogs/56.txt
#	metadata/en-US/full_description.txt
#	metadata/en-US/images/phoneScreenshots/1.jpg
#	metadata/en-US/images/phoneScreenshots/2.jpg
#	metadata/en-US/images/phoneScreenshots/3.jpg
#	metadata/en-US/images/phoneScreenshots/4.jpg
#	metadata/en-US/images/phoneScreenshots/5.jpg
#	metadata/en-US/images/phoneScreenshots/6.jpg
#	metadata/en-US/short_description.txt
#	metadata/en-US/title.txt
#	metadata/es/changelogs/50.txt
#	metadata/es/changelogs/51.txt
#	metadata/es/full_description.txt
#	metadata/fr-FR/full_description.txt
#	metadata/gl-ES/short_description.txt
#	metadata/gl-ES/title.txt
#	metadata/id/full_description.txt
#	metadata/nl-NL/short_description.txt
#	metadata/nl-NL/title.txt
#	metadata/pt-BR/full_description.txt
#	metadata/sl/short_description.txt
#	metadata/sl/title.txt
#	metadata/sv/full_description.txt

.github/ISSUE_TEMPLATE/bug_report.md

@@ -8,25 +8,35 @@ assignees: ''
 ---
 
 **Describe the bug**
+
 A clear and concise description of what the bug is.
 
-**To Reproduce**
+**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?
+(Please test using the respective `upstream-xxxxxx.apk` provided in [Releases](https://github.com/sk22/megalodon/releases) or at least using the current Mastodon version from the Play Store)
+
+> 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**
+
 Megalodon version: [e.g. v1.1.4+fork.#]
 
-**Additional context**
-- Does this issue also occur with the respective upstream release? (Please test using the respective `upstream-xxxxxx.apk` provided in [Releases](https://github.com/sk22/megalodon/releases)) No / Yes (`mastodon#…`)
-
-  > In this case, 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!
-
 **Crash log**
+
 If you know your way around Android development tools, please consider attaching a crash log, if possible.