LucasGGamerM
e1a262ec5f
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
2023-06-13 14:03:50 -03:00
..
2023-06-13 14:03:50 -03:00
2023-02-13 15:38:28 -03:00
2023-02-13 15:38:28 -03:00
2023-05-21 13:25:16 +00:00
2023-03-07 15:20:40 -03:00
2023-04-21 13:51:50 +00:00
2023-04-02 11:39:55 +00:00
2023-04-22 13:53:50 -03:00
2023-02-07 16:04:28 -03:00
2023-04-22 14:30:34 +00:00
2023-04-07 10:51:45 +00:00
2023-05-20 13:26:05 +00:00
2023-06-11 15:37:38 +00:00
2023-06-11 19:15:25 +00:00
2023-04-22 13:53:50 -03:00
2023-06-13 14:03:50 -03:00
2023-02-01 22:00:12 -03:00
2023-06-11 19:15:26 +00:00
2023-05-23 19:31:49 -03:00
2023-01-30 19:04:45 +00:00
2023-03-07 17:52:01 +00:00
2023-06-13 14:03:50 -03:00
2023-06-11 15:37:38 +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-04-12 14:00:28 -03:00
2023-05-30 22:01:22 +00:00
2023-03-16 00:19:12 +00:00
2023-02-11 13:13:08 +00:00