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-10-19 15:01:22 -03:00
2023-10-07 21:46:18 +00:00
2023-02-23 04:08:21 +00:00
2023-02-23 04:08:21 +00:00