Mastodon
/
moshidon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
moshidon/metadata
History
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
..
ca Merge remote-tracking branch 'megalodon_weblate/main' 2023-02-13 15:38:28 -03:00
cy/changelogs Merge remote-tracking branch 'megalodon_weblate/main' 2023-02-13 15:38:28 -03:00
de-DE Translated using Weblate (German) 2023-03-07 17:52:01 +00:00
en-US docs: add changelog 2023-03-07 15:20:40 -03:00
es/changelogs Merge remote-tracking branch 'megalodon_main/main' 2023-03-21 20:25:51 -03:00
es-ES Translated using Weblate (Spanish) 2023-03-07 17:52:01 +00:00
fr-FR Merge branch 'main' 2023-02-07 16:04:28 -03:00
gl-ES Translated using Weblate (Galician) 2023-03-16 00:19:11 +00:00
id/changelogs Translated using Weblate (Indonesian) 2023-03-16 00:19:11 +00:00
it-IT/changelogs Translated using Weblate (Italian) 2023-03-16 00:19:11 +00:00
ko/changelogs Translated using Weblate (Korean) 2023-03-16 00:19:11 +00:00
nl-NL Translated using Weblate (Dutch) 2023-02-01 22:00:12 -03:00
pl Translated using Weblate (Polish) 2023-03-16 00:19:11 +00:00
pl-PL Translated using Weblate (Polish) 2023-01-30 19:04:45 +00:00
pt-BR Translated using Weblate (Portuguese (Brazil)) 2023-03-07 17:52:01 +00:00
sl Merge remote-tracking branch 'megalodon_weblate/main' 2023-02-13 15:38:28 -03:00
sv/changelogs Merge remote-tracking branch 'megalodon_weblate/main' 2023-02-13 15:38:28 -03:00
sv-SE Translated using Weblate (Swedish) 2023-02-01 22:00:12 -03:00
uk Translated using Weblate (Ukrainian) 2023-03-16 00:19:11 +00:00
zh-CN Translated using Weblate (Chinese (Simplified)) 2023-03-07 17:52:01 +00:00
zh-Hans/changelogs Translated using Weblate (Chinese (Simplified)) 2023-03-16 00:19:12 +00:00
zh-TW Translated using Weblate (Chinese (Traditional)) 2023-02-11 13:13:08 +00:00