Merge remote-tracking branch 'megalodon_main/main'

# Conflicts:
#	mastodon/build.gradle
This commit is contained in:
LucasGGamerM
2023-10-21 09:32:19 -03:00
63 changed files with 298 additions and 157 deletions

View File

@@ -643,4 +643,5 @@
<!-- Screen reader description for the menu on the home timeline screen -->
<!-- %s is the name of the list -->
<!-- %s is a username -->
<string name="see_new_posts">Zobrazit nové příspěvky</string>
</resources>