LucasGGamerM 94ac5b9bb7 Merge branch 'feature/language-selector' into fork ...

# Conflicts:
#	mastodon/src/main/java/org/joinmastodon/android/GlobalUserPreferences.java
#	mastodon/src/main/java/org/joinmastodon/android/fragments/ComposeFragment.java
#	mastodon/src/main/res/values/strings.xml

2022-12-14 19:03:15 -03:00

..

java

Merge branch 'feature/language-selector' into fork

2022-12-14 19:03:15 -03:00

res

Merge branch 'feature/language-selector' into fork

2022-12-14 19:03:15 -03:00

AndroidManifest.xml

Fixing the notification color, and app name

2022-12-10 09:33:36 -03:00

ic_launcher-playstore.png

Fixing the notification icon once again...

2022-12-07 09:36:50 -03:00