LucasGGamerM 6548751bb0 Merge remote-tracking branch 'megalodon_weblate/main' ... # Conflicts: # mastodon/src/main/res/values-es-rES/strings_sk.xml # mastodon/src/main/res/values-pl-rPL/strings_sk.xml # mastodon/src/main/res/values-uk-rUA/strings_sk.xml		2023-05-23 19:31:49 -03:00
..
changelogs	Merge remote-tracking branch 'megalodon_weblate/main'	2023-05-23 19:31:49 -03:00