moshidon/metadata
LucasGGamerM 1e2dd3dec6 Merge remote-tracking branch 'megalodon_main/main'
# Conflicts:
#	mastodon/build.gradle
#	mastodon/src/main/java/org/joinmastodon/android/fragments/BaseStatusListFragment.java
#	mastodon/src/main/java/org/joinmastodon/android/fragments/ProfileFragment.java
#	mastodon/src/main/java/org/joinmastodon/android/fragments/SettingsFragment.java
#	mastodon/src/main/java/org/joinmastodon/android/ui/utils/UiUtils.java
2023-02-17 17:40:06 -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 Merge remote-tracking branch 'megalodon_main/main' 2023-02-17 17:40:06 -03:00
en-US Merge remote-tracking branch 'megalodon_main/main' 2023-02-17 17:40:06 -03:00
es/changelogs Translated using Weblate (Spanish) 2023-02-17 12:27:57 +00:00
es-ES Delete duplicate metadata entries 2023-02-13 15:32:53 -03:00
fr-FR Merge branch 'main' 2023-02-07 16:04:28 -03:00
gl-ES Translated using Weblate (Galician) 2023-02-17 12:27:57 +00:00
ko/changelogs Translated using Weblate (Korean) 2023-02-17 12:27:57 +00:00
nl-NL Translated using Weblate (Dutch) 2023-02-01 22:00:12 -03:00
pl/changelogs Translated using Weblate (Polish) 2023-02-17 12:27:57 +00:00
pl-PL Translated using Weblate (Polish) 2023-01-30 19:04:45 +00:00
pt-BR/changelogs Merge remote-tracking branch 'megalodon_weblate/main' 2023-02-13 15:38:28 -03: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/changelogs Translated using Weblate (Ukrainian) 2023-02-17 12:27:57 +00:00
zh-CN Translated using Weblate (Chinese (Simplified)) 2023-02-01 22:00:13 -03:00
zh-Hans/changelogs Merge remote-tracking branch 'megalodon_weblate/main' 2023-02-13 15:38:28 -03:00
zh-TW Translated using Weblate (Chinese (Traditional)) 2023-02-11 13:13:08 +00:00