Files
moshidon/mastodon/src/main/res/layout
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-03-07 14:01:40 +03:00
2022-03-31 20:54:49 +03:00
2023-02-07 14:10:31 +01:00
2023-01-18 13:57:50 -03:00
2022-02-07 15:07:12 +03:00
2022-02-07 15:07:12 +03:00
2022-03-05 12:59:27 +03:00
2022-05-13 19:18:29 +03:00
2022-02-22 07:17:16 +03:00
2022-02-16 03:58:13 +03:00
2023-01-27 14:32:04 -03:00
2022-03-07 14:01:40 +03:00
2022-12-04 01:34:03 +03:00
2022-03-05 12:59:27 +03:00
2023-02-07 18:32:46 -03:00
2022-03-07 14:01:40 +03:00
2022-03-07 14:01:40 +03:00
2022-03-31 20:54:49 +03:00
2023-02-12 04:03:09 +03:00
2023-01-27 14:46:16 -03:00
2023-01-27 15:37:36 -03:00
2023-01-16 15:26:27 -03:00
2023-01-27 15:24:48 -03:00
2022-12-04 01:34:03 +03:00
2022-03-31 20:54:49 +03:00
2023-02-06 13:53:28 +01:00
2023-01-27 14:32:04 -03:00
2022-03-02 12:38:14 +03:00
2022-03-02 12:38:14 +03:00
2023-01-30 01:54:13 +03:00
2022-02-07 15:07:12 +03:00
2022-02-07 15:07:12 +03:00
2022-02-07 15:07:12 +03:00