Merge remote-tracking branch 'megalodon_main/main'
# Conflicts: # README.md # mastodon/build.gradle # mastodon/src/main/java/org/joinmastodon/android/GlobalUserPreferences.java # mastodon/src/main/java/org/joinmastodon/android/PushNotificationReceiver.java # mastodon/src/main/java/org/joinmastodon/android/fragments/HomeTimelineFragment.java # mastodon/src/main/java/org/joinmastodon/android/fragments/ThreadFragment.java # mastodon/src/main/java/org/joinmastodon/android/model/Status.java # mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/ExtendedFooterStatusDisplayItem.java # mastodon/src/main/res/values-it-rIT/strings_sk.xml # metadata/de-DE/changelogs/83.txt # metadata/de-DE/changelogs/94.txt # metadata/en-US/changelogs/94.txt # metadata/es/changelogs/94.txt # metadata/fr/title.txt # metadata/my-MM/title.txt # metadata/my/short_description.txt # metadata/pt-PT/changelogs/59.txt # metadata/pt-PT/changelogs/61.txt # metadata/pt-PT/full_description.txt # metadata/pt-PT/short_description.txt # metadata/pt-PT/title.txt
This commit is contained in:
LucasGGamerM