LucasGGamerM 1ba30a4d28 Merge remote-tracking branch 'megalodon_main/main' ...

# Conflicts:
#	mastodon/build.gradle
#	mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/FooterStatusDisplayItem.java
#	mastodon/src/main/res/values-ar/strings_sk.xml
#	mastodon/src/main/res/values-fr-rFR/strings_sk.xml
#	mastodon/src/main/res/values-ja-rJP/strings_sk.xml
#	metadata/ar/short_description.txt

2023-09-11 16:47:24 -03:00

..

changelogs

Merge remote-tracking branch 'megalodon_main/main'

2023-09-11 16:47:24 -03:00

short_description.txt

Translated using Weblate (Catalan)

2023-02-13 18:33:06 +00:00

title.txt

Translated using Weblate (Catalan)

2023-02-13 18:33:06 +00:00