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/src/main/java/org/joinmastodon/android/fragments/settings/SettingsAboutAppFragment.java
This commit is contained in:
LucasGGamerM
2023-08-29 10:41:09 -03:00
parent 7191e5a96a 580ae15af6
commit c4b7262e89
60 changed files with 522 additions and 220 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mastodon/src/main/res/values/urls.xml
View File

@@ -2,5 +2,5 @@
<resources>
<string name="repo_url" translatable="false">https://github.com/sk22/megalodon</string>
<string name="privacy_policy_url" translatable="false">https://joinmastodon.org/privacy-policy</string>
<string name="donate_url" translatable="false">https://ko-fi.com/xsk22</string>
<string name="donate_hashtag" translatable="false">MutualAid</string>
</resources>