LucasGGamerM
06a26d308f
Merge branch 'merge-upstream'
# Conflicts:
# mastodon/build.gradle
# mastodon/src/androidTest/java/org/joinmastodon/android/utils/StatusFilterPredicateTest.java
# mastodon/src/main/java/org/joinmastodon/android/ExternalShareActivity.java
# mastodon/src/main/java/org/joinmastodon/android/GlobalUserPreferences.java
# mastodon/src/main/java/org/joinmastodon/android/MainActivity.java
# mastodon/src/main/java/org/joinmastodon/android/api/CacheController.java
# mastodon/src/main/java/org/joinmastodon/android/api/MastodonAPIController.java
# mastodon/src/main/java/org/joinmastodon/android/api/requests/lists/AddAccountsToList.java
# mastodon/src/main/java/org/joinmastodon/android/api/requests/lists/CreateList.java
# mastodon/src/main/java/org/joinmastodon/android/api/requests/lists/DeleteList.java
# mastodon/src/main/java/org/joinmastodon/android/api/requests/lists/GetList.java
# mastodon/src/main/java/org/joinmastodon/android/api/requests/lists/GetLists.java
# mastodon/src/main/java/org/joinmastodon/android/api/requests/lists/RemoveAccountsFromList.java
# mastodon/src/main/java/org/joinmastodon/android/api/requests/lists/UpdateList.java
# mastodon/src/main/java/org/joinmastodon/android/api/requests/statuses/GetStatusEditHistory.java
# mastodon/src/main/java/org/joinmastodon/android/api/requests/timelines/GetPublicTimeline.java
# mastodon/src/main/java/org/joinmastodon/android/api/session/AccountLocalPreferences.java
# mastodon/src/main/java/org/joinmastodon/android/api/session/AccountSession.java
# mastodon/src/main/java/org/joinmastodon/android/events/ListDeletedEvent.java
# mastodon/src/main/java/org/joinmastodon/android/events/ListUpdatedCreatedEvent.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/CustomLocalTimelineFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/EditTimelinesFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/HashtagTimelineFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/HomeFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/HomeTabFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/ListTimelineFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/ListsFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/NotificationsListFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/ProfileFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/ThreadFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/account_list/PaginatedAccountListFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/discover/DiscoverPostsFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/discover/FederatedTimelineFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/discover/LocalTimelineFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/discover/SearchFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/settings/SettingsAboutAppFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/settings/SettingsMainFragment.java
# mastodon/src/main/java/org/joinmastodon/android/model/Status.java
# mastodon/src/main/java/org/joinmastodon/android/model/TimelineDefinition.java
# mastodon/src/main/java/org/joinmastodon/android/model/viewmodel/AccountViewModel.java
# mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/ExtendedFooterStatusDisplayItem.java
# mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/LinkCardStatusDisplayItem.java
# mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/StatusDisplayItem.java
# mastodon/src/main/java/org/joinmastodon/android/ui/photoviewer/PhotoViewer.java
# mastodon/src/main/java/org/joinmastodon/android/ui/sheets/AccountSwitcherSheet.java
# mastodon/src/main/java/org/joinmastodon/android/ui/text/HtmlParser.java
# mastodon/src/main/java/org/joinmastodon/android/ui/text/LinkSpan.java
# mastodon/src/main/java/org/joinmastodon/android/ui/utils/ActionModeHelper.java
# mastodon/src/main/java/org/joinmastodon/android/ui/utils/UiUtils.java
# mastodon/src/main/java/org/joinmastodon/android/ui/viewcontrollers/ComposeLanguageAlertViewController.java
# mastodon/src/main/java/org/joinmastodon/android/ui/viewholders/AccountViewHolder.java
# mastodon/src/main/java/org/joinmastodon/android/ui/views/ListEditor.java
# mastodon/src/main/res/drawable/fg_link_card.xml
# mastodon/src/main/res/drawable/ic_arrow_drop_down_24px.xml
# mastodon/src/main/res/drawable/ic_arrow_right_24px.xml
# mastodon/src/main/res/drawable/ic_arrow_upward_24px.xml
# mastodon/src/main/res/drawable/ic_bookmark_fill1_24px.xml
# mastodon/src/main/res/drawable/ic_boost_24px.xml
# mastodon/src/main/res/drawable/ic_boost_private.xml
# mastodon/src/main/res/drawable/ic_help_24px.xml
# mastodon/src/main/res/drawable/ic_info_fill1_24px.xml
# mastodon/src/main/res/drawable/ic_m3_cancel.xml
# mastodon/src/main/res/layout/display_item_extended_footer.xml
# mastodon/src/main/res/layout/display_item_link_card.xml
# mastodon/src/main/res/layout/fragment_onboarding_follow_suggestions.xml
# mastodon/src/main/res/layout/fragment_onboarding_profile_setup.xml
# mastodon/src/main/res/layout/home_toolbar.xml
# mastodon/src/main/res/layout/item_discover_account.xml
# mastodon/src/main/res/layout/item_generic_list_content.xml
# mastodon/src/main/res/menu/post.xml
# mastodon/src/main/res/menu/profile.xml
# mastodon/src/main/res/values-ar-rSA/strings.xml
# mastodon/src/main/res/values-be-rBY/strings.xml
# mastodon/src/main/res/values-ca-rES/strings.xml
# mastodon/src/main/res/values-cs-rCZ/strings.xml
# mastodon/src/main/res/values-da-rDK/strings.xml
# mastodon/src/main/res/values-eu-rES/strings.xml
# mastodon/src/main/res/values-fa-rIR/strings.xml
# mastodon/src/main/res/values-fi-rFI/strings.xml
# mastodon/src/main/res/values-fil-rPH/strings.xml
# mastodon/src/main/res/values-fr-rFR/strings.xml
# mastodon/src/main/res/values-gd-rGB/strings.xml
# mastodon/src/main/res/values-gl-rES/strings.xml
# mastodon/src/main/res/values-hu-rHU/strings.xml
# mastodon/src/main/res/values-hy-rAM/strings.xml
# mastodon/src/main/res/values-in-rID/strings.xml
# mastodon/src/main/res/values-is-rIS/strings.xml
# mastodon/src/main/res/values-it-rIT/strings.xml
# mastodon/src/main/res/values-ja-rJP/strings.xml
# mastodon/src/main/res/values-kab/strings.xml
# mastodon/src/main/res/values-ko-rKR/strings.xml
# mastodon/src/main/res/values-nl-rNL/strings.xml
# mastodon/src/main/res/values-pl-rPL/strings.xml
# mastodon/src/main/res/values-pt-rBR/strings.xml
# mastodon/src/main/res/values-pt-rPT/strings.xml
# mastodon/src/main/res/values-ro-rRO/strings.xml
# mastodon/src/main/res/values-ru-rRU/strings.xml
# mastodon/src/main/res/values-sl-rSI/strings.xml
# mastodon/src/main/res/values-sv-rSE/strings.xml
# mastodon/src/main/res/values-tr-rTR/strings.xml
# mastodon/src/main/res/values-uk-rUA/strings.xml
# mastodon/src/main/res/values-zh-rCN/strings.xml
# mastodon/src/main/res/values/attrs.xml
# mastodon/src/main/res/values/palettes.xml
# mastodon/src/main/res/values/strings.xml
# mastodon/src/main/res/values/styles.xml
2024-03-16 18:21:22 -03:00
..
2024-03-16 18:21:22 -03:00
2023-07-16 18:01:42 +02:00
2022-02-17 00:58:12 +03:00
2024-02-14 21:08:16 -03:00
2024-02-14 21:08:16 -03:00