moshidon/mastodon
LucasGGamerM 1bb288e565 Merge remote-tracking branch 'refs/remotes/megalodon_weblate/main'
# Conflicts:
#	metadata/ar/full_description.txt
#	metadata/de-DE/full_description.txt
#	metadata/es/changelogs/110.txt
#	metadata/es/full_description.txt
#	metadata/gl-ES/full_description.txt
#	metadata/pl/changelogs/94.txt
#	metadata/pl/full_description.txt
#	metadata/ro/full_description.txt
#	metadata/uk/changelogs/62.txt
#	metadata/uk/full_description.txt
#	metadata/zh-Hans/changelogs/62.txt
#	metadata/zh-Hans/changelogs/63.txt
#	metadata/zh-Hans/changelogs/65.txt
#	metadata/zh-Hans/full_description.txt
2024-07-24 17:44:09 -03:00
..
src Merge remote-tracking branch 'refs/remotes/megalodon_weblate/main' 2024-07-24 17:44:09 -03:00
.editorconfig
.gitignore
build.gradle build: add name suffixes for F-Droid and GitHub versions 2024-05-18 13:28:30 -03:00
proguard-rules.pro chore(merging-upstream): bunch of conflicts to solve 2024-02-14 21:08:16 -03:00