LucasGGamerM c4b7262e89 Merge remote-tracking branch 'megalodon_main/main' ... # Conflicts: # mastodon/src/main/java/org/joinmastodon/android/fragments/settings/SettingsAboutAppFragment.java		2023-08-29 10:41:09 -03:00
..
changelogs	Translated using Weblate (Persian)	2023-08-28 14:53:05 +00:00
short_description.txt	Translated using Weblate (Persian)	2023-08-21 22:40:19 +02:00
title.txt	Translated using Weblate (Persian)	2023-08-21 22:40:19 +02:00