LucasGGamerM
da5186c7b5
Merge remote-tracking branch 'megalodon_main/main'
# Conflicts:
# mastodon/build.gradle
# mastodon/src/main/java/org/joinmastodon/android/api/requests/accounts/SetPrivateNote.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/BaseStatusListFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/ComposeFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/EditTimelinesFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/ProfileFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/StatusEditHistoryFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/StatusListFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/settings/SettingsAboutAppFragment.java
# mastodon/src/main/java/org/joinmastodon/android/model/TimelineDefinition.java
# mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/FooterStatusDisplayItem.java
# mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/StatusDisplayItem.java
# mastodon/src/main/java/org/joinmastodon/android/ui/text/DiffRemovedSpan.java
# mastodon/src/main/java/org/joinmastodon/android/ui/text/HtmlParser.java
# mastodon/src/main/res/drawable/bg_note_edit.xml
# mastodon/src/main/res/layout/fragment_profile.xml
# metadata/uk/full_description.txt
2023-11-17 16:02:23 -03:00
..
2023-02-11 13:13:08 +00:00
2023-11-15 15:46:34 +00:00
2023-11-15 15:46:34 +00:00
2023-11-15 15:46:34 +00:00
2023-11-15 15:46:34 +00:00