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

..

src

Merge branch 'feature/language-selector' into fork

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

.gitignore

Fix volume buttons in photo viewer

2022-02-17 00:58:12 +03:00

build.gradle

Bump version number

2022-12-12 21:45:48 -03:00

proguard-rules.pro

Get rid of Microsoft appcenter related stuff

2022-11-26 13:37:03 +05:30