LucasGGamerM
0589612df9
Merge remote-tracking branch 'megalodon_main/main'
# Conflicts:
# README.md
# mastodon/build.gradle
# mastodon/src/main/java/org/joinmastodon/android/GlobalUserPreferences.java
# mastodon/src/main/java/org/joinmastodon/android/PushNotificationReceiver.java
# mastodon/src/main/java/org/joinmastodon/android/api/session/AccountSessionManager.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/HomeFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/SettingsFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/discover/DiscoverAccountsFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/discover/DiscoverNewsFragment.java
# mastodon/src/main/java/org/joinmastodon/android/fragments/discover/TrendingHashtagsFragment.java
# mastodon/src/main/java/org/joinmastodon/android/model/NotificationAction.java
# mastodon/src/main/java/org/joinmastodon/android/model/Status.java
# mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/ExtendedFooterStatusDisplayItem.java
# mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/ReblogOrReplyLineStatusDisplayItem.java
# mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/StatusDisplayItem.java
# mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/TextStatusDisplayItem.java
# mastodon/src/main/java/org/joinmastodon/android/ui/text/ClickableLinksDelegate.java
# mastodon/src/main/java/org/joinmastodon/android/ui/text/LinkSpan.java
# mastodon/src/main/java/org/joinmastodon/android/ui/utils/MediaAttachmentViewController.java
# mastodon/src/main/java/org/joinmastodon/android/ui/utils/UiUtils.java
# mastodon/src/main/res/layout/display_item_gifv.xml
# mastodon/src/main/res/layout/display_item_photo.xml
# mastodon/src/main/res/layout/display_item_video.xml
# mastodon/src/main/res/menu/post.xml
# mastodon/src/main/res/menu/profile.xml
# mastodon/src/main/res/values-es-rES/strings_sk.xml
# mastodon/src/main/res/values-fr-rFR/strings_sk.xml
# mastodon/src/main/res/values-gl-rES/strings_sk.xml
# mastodon/src/main/res/values-in-rID/strings_sk.xml
# mastodon/src/main/res/values-pl-rPL/strings_sk.xml
# mastodon/src/main/res/values-uk-rUA/strings_sk.xml
# metadata/it-IT/full_description.txt
# metadata/zh-Hans/short_description.txt
2023-03-21 20:25:51 -03:00
..
2022-12-16 10:30:42 -03:00
2023-03-17 02:30:21 +01:00
2022-02-10 22:10:16 +03:00
2023-01-27 15:33:40 -03:00
2022-02-08 13:25:17 +03:00
2023-01-27 14:28:17 -03:00
2022-01-14 15:02:10 +03:00
2022-04-28 23:22:55 +03:00
2022-03-02 12:38:14 +03:00
2023-02-20 11:49:48 -03:00
2022-01-24 02:56:57 +03:00
2022-01-18 22:49:14 +03:00
2022-02-02 09:40:29 +03:00
2022-10-31 20:51:28 +00:00
2023-02-07 18:25:46 -03:00
2022-12-31 14:28:06 -03:00
2022-03-02 12:38:14 +03:00
2022-11-09 15:48:01 +01:00
2022-05-02 05:45:51 +03:00
2022-02-08 13:25:17 +03:00
2023-02-16 17:04:56 +01:00
2023-01-27 14:48:54 -03:00
2023-03-21 19:55:34 -03:00
2023-03-21 19:55:34 -03:00
2022-02-08 13:25:17 +03:00
2023-01-27 15:33:40 -03:00
2023-03-16 01:02:33 +01:00
2022-04-12 23:58:29 +03:00
2023-01-30 01:54:13 +03:00
2023-03-18 22:39:08 -03:00
2022-10-31 20:51:28 +00:00
2023-01-27 15:33:40 -03:00
2023-01-27 15:33:40 -03:00
2023-01-30 01:54:13 +03:00
2022-03-07 14:01:40 +03:00
2023-02-06 14:00:52 +01:00
2023-02-16 19:44:39 +01:00
2022-03-31 17:49:54 +03:00
2022-03-17 06:28:36 +03:00
2022-01-18 22:49:14 +03:00
2023-03-21 20:25:51 -03:00
2022-02-11 18:16:56 +03:00
2023-01-27 15:28:17 -03:00
2023-02-20 11:49:48 -03:00
2022-01-14 15:02:10 +03:00
2022-12-20 16:52:48 -03:00