LucasGGamerM
77081f6cc9
Merge remote-tracking branch 'megalodon_main/main'
# Conflicts:
# mastodon/build.gradle
# mastodon/src/main/java/org/joinmastodon/android/fragments/HomeFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/settings/SettingsAboutAppFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/settings/SettingsBehaviorFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/settings/SettingsDisplayFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/settings/SettingsMainFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/settings/SettingsNotificationsFragment.java
# mastodon/src/main/java/org/joinmastodon/android/model/Status.java
# mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/StatusDisplayItem.java
# mastodon/src/main/res/menu/profile_own.xml
2023-10-19 15:01:22 -03:00
..
2023-08-31 17:24:29 +02:00
2022-04-08 00:24:11 +03:00
2022-03-07 14:01:40 +03:00
2022-11-17 18:52:22 +01:00
2023-01-27 14:49:53 -03:00
2023-01-27 14:49:53 -03:00
2023-06-15 19:21:26 +02:00
2022-11-12 03:03:52 +01:00
2023-08-20 11:36:16 -03:00
2022-04-08 00:11:45 +03:00
2023-10-16 19:14:16 +02:00
2022-11-26 23:09:46 +03:00
2022-12-31 14:05:03 -03:00
2023-10-14 01:47:13 +02:00
2022-10-31 09:26:17 +03:00
2023-08-20 11:36:16 -03:00
2023-08-20 11:36:16 -03:00
2023-08-31 17:24:29 +02:00
2023-10-18 21:48:11 +02:00
2022-02-18 01:50:00 +03:00
2023-08-20 11:36:16 -03:00
2023-09-19 14:26:46 -03:00
2022-05-06 19:07:51 +02:00
2022-09-02 05:47:20 +03:00
2023-06-11 21:39:35 -03:00