LucasGGamerM
64e681c227
Merge remote-tracking branch 'megalodon_main/main'
# Conflicts:
# mastodon/build.gradle
# mastodon/src/main/java/org/joinmastodon/android/GlobalUserPreferences.java
# mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/FooterStatusDisplayItem.java
# mastodon/src/main/java/org/joinmastodon/android/ui/utils/UiUtils.java
# metadata/de-DE/changelogs/83.txt
# metadata/en-US/changelogs/83.txt
2023-04-12 13:04:31 -03:00
..
2023-01-23 18:47:07 -03:00
2023-03-24 18:40:14 +00:00
2023-01-30 00:02:07 +01:00