LucasGGamerM 5b391b44d3 Merge remote-tracking branch 'megalodon_main/main' ... # Conflicts: # mastodon/build.gradle # mastodon/src/github/AndroidManifest.xml # mastodon/src/main/res/values-de-rDE/strings_sk.xml # mastodon/src/main/res/values-es-rES/strings_sk.xml # mastodon/src/main/res/values-eu-rES/strings_sk.xml # mastodon/src/main/res/values-ko-rKR/strings_sk.xml # mastodon/src/main/res/values-pl-rPL/strings_sk.xml # mastodon/src/main/res/values-uk-rUA/strings_sk.xml # metadata/es/changelogs/83.txt # metadata/fr/short_description.txt # metadata/gl-ES/changelogs/83.txt		2023-04-22 13:53:50 -03:00
..
changelogs	Merge remote-tracking branch 'megalodon_main/main'	2023-04-22 13:53:50 -03:00