owen/moshidon
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'megalodon_main/main'

Browse Source 
# Conflicts:
#	mastodon/build.gradle
#	mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/FooterStatusDisplayItem.java
#	mastodon/src/main/res/values-ar/strings_sk.xml
#	mastodon/src/main/res/values-fr-rFR/strings_sk.xml
#	mastodon/src/main/res/values-ja-rJP/strings_sk.xml
#	metadata/ar/short_description.txt
This commit is contained in:
LucasGGamerM
2023-09-11 16:47:24 -03:00
parent da54c93af1 380e4ff77e
commit 1ba30a4d28
49 changed files with 1737 additions and 526 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
mastodon/src/main/res/values-kab/strings_sk.xml
View File

@@ -1,3 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
</resources>
<string name="sk_app_name">Megalodon</string>
</resources>