LucasGGamerM
e2c62aa76b
Merge remote-tracking branch 'megalodon_main/main'
# Conflicts:
# mastodon/build.gradle
# mastodon/src/main/java/org/joinmastodon/android/GlobalUserPreferences.java
# mastodon/src/main/java/org/joinmastodon/android/api/requests/accounts/GetAccountByHandle.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/ProfileFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/ThreadFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/account_list/BaseAccountListFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/account_list/FollowerListFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/account_list/FollowingListFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/account_list/PaginatedAccountListFragment.java
# mastodon/src/main/java/org/joinmastodon/android/model/Account.java
# mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/FooterStatusDisplayItem.java
# mastodon/src/main/java/org/joinmastodon/android/ui/text/ClickableLinksDelegate.java
# mastodon/src/main/java/org/joinmastodon/android/ui/utils/UiUtils.java
# mastodon/src/main/res/layout/display_item_footer.xml
# mastodon/src/main/res/values/dimens.xml
2023-06-09 18:09:23 -03:00
..
2022-11-27 13:39:50 +03:00
2023-06-09 18:09:23 -03:00
2023-06-09 18:09:23 -03:00
2022-01-14 15:02:10 +03:00
2023-03-21 19:55:34 -03:00
2022-06-06 16:45:56 +03:00
2023-06-05 11:22:01 +02:00
2022-03-24 12:39:28 +03:00
2022-03-24 12:39:28 +03:00
2022-03-24 12:39:28 +03:00
2022-11-27 13:39:50 +03:00
2023-06-09 18:09:23 -03:00
2023-06-07 21:11:20 +02:00
2022-10-04 07:35:31 +03:00
2023-04-22 16:51:44 +02:00
2022-01-14 15:02:10 +03:00
2022-02-04 13:50:19 +03:00
2023-01-18 13:23:23 -03:00
2022-01-14 15:02:10 +03:00
2022-11-08 09:36:56 +03:00
2023-06-04 19:08:18 +02:00