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

Merge remote-tracking branch 'upstream/master' into fork

This commit is contained in:
sk 2022-11-23 22:01:37 +01:00
parent 9f1c0e534c 9facdb938d
commit 781332a7a9
3 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
.github/FUNDING.yml vendored Normal file
View File

@ -0,0 +1,12 @@
# These are supported funding model platforms
github: # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2]
patreon: # mastodon
open_collective: # Replace with a single Open Collective username e.g., user1
ko_fi: xsk22
tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel
community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry
liberapay: # Replace with a single Liberapay username e.g., user1
issuehunt: # Replace with a single IssueHunt username e.g., user1
otechie: # Replace with a single Otechie username e.g., user1
custom: # Replace with up to 4 custom sponsorship URLs e.g., ['link1', 'link2']

4
README.md
View File

@ -1,6 +1,6 @@
# Mastodos?
Currently trying to find out whether I'll have to rename the project. I will definitely need a new logo, though, since `The Mastodon name and logo are trademarks of Mastodon gGmbH. If you intend to redistribute a modified version of this app, use a unique name and icon for your app that does not mistakenly imply any official connection with or endorsement by Mastodon gGmbH.` Feel free to help me in https://github.com/sk22/mastodos/issues/15
Currently trying to find out whether I'll have to rename the project. I will definitely need a new logo, though, since `The Mastodon name and logo are trademarks of Mastodon gGmbH. If you intend to redistribute a modified version of this app, use a unique name and icon for your app that does not mistakenly imply any official connection with or endorsement by Mastodon gGmbH.` Feel free to help me in [https://github.com/sk22/mastodos/issues/15](https://github.com/sk22/mastodos/issues/15)
---
@ -123,7 +123,7 @@ Variant without the integrated updater. This is the variant to be published to F
### Branding
**TODO:** Come up with "a unique name and icon for your app that does not mistakenly imply any official connection with or endorsement by Mastodon gGmbH"...
https://github.com/sk22/mastodos/issues/15
[https://github.com/sk22/mastodos/issues/15](https://github.com/sk22/mastodos/issues/15)
## Building

4
mastodon/build.gradle
View File

@ -9,8 +9,8 @@ android {
applicationId "org.joinmastodon.android.sk"
minSdk 23
targetSdk 33
versionCode 47
versionName "1.1.4+fork.47"
versionCode 48
versionName "1.1.4+fork.48"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
resConfigs "en", "ar-rSA", "bs-rBA", "ca-rES", "cs-rCZ", "de-rDE", "el-rGR", "es-rES",
"eu-rES", "fi-rFI", "fr-rFR", "gl-rES", "hr-rHR", "hy-rAM", "it-rIT", "iw-rIL",