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
..
2022-12-03 04:15:03 +01:00
2023-02-13 15:38:28 -03:00
2023-02-13 15:38:28 -03:00
2023-04-02 11:39:55 +00:00
2023-03-24 20:05:42 +01:00
2023-04-02 11:39:55 +00:00
2023-04-02 11:39:55 +00:00
2022-12-03 04:15:03 +01:00
2023-02-07 16:04:28 -03:00
2023-03-16 00:19:11 +00:00
2023-03-16 00:19:11 +00:00
2023-03-16 00:19:11 +00:00
2022-12-03 04:15:08 +01:00
2023-03-16 00:19:11 +00:00
2023-02-01 22:00:12 -03:00
2022-12-03 04:15:12 +01:00
2023-03-16 00:19:11 +00:00
2023-01-30 19:04:45 +00:00
2023-03-07 17:52:01 +00:00
2023-02-13 15:38:28 -03:00
2023-04-02 11:39:55 +00:00
2023-02-01 22:00:12 -03:00
2023-03-16 00:19:11 +00:00
2023-03-07 17:52:01 +00:00
2023-03-16 00:19:12 +00:00
2023-02-11 13:13:08 +00:00