LucasGGamerM 64e681c227 Merge remote-tracking branch 'megalodon_main/main' ...

# Conflicts:
#	mastodon/build.gradle
#	mastodon/src/main/java/org/joinmastodon/android/GlobalUserPreferences.java
#	mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/FooterStatusDisplayItem.java
#	mastodon/src/main/java/org/joinmastodon/android/ui/utils/UiUtils.java
#	metadata/de-DE/changelogs/83.txt
#	metadata/en-US/changelogs/83.txt

2023-04-12 13:04:31 -03:00

..

src

Merge remote-tracking branch 'megalodon_main/main'

2023-04-12 13:04:31 -03:00

.gitignore

Fix volume buttons in photo viewer

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

build.gradle

Merge pull request #160 from FineFindus/fix/sign-in-flow

2023-04-10 07:34:19 -03:00

proguard-rules.pro

Fix crash in ComposeFragment::onSaveInstanceState in release builds

2022-12-15 20:02:26 +03:00