LucasGGamerM 1e2dd3dec6 Merge remote-tracking branch 'megalodon_main/main' ...

# Conflicts:
#	mastodon/build.gradle
#	mastodon/src/main/java/org/joinmastodon/android/fragments/BaseStatusListFragment.java
#	mastodon/src/main/java/org/joinmastodon/android/fragments/ProfileFragment.java
#	mastodon/src/main/java/org/joinmastodon/android/fragments/SettingsFragment.java
#	mastodon/src/main/java/org/joinmastodon/android/ui/utils/UiUtils.java

2023-02-17 17:40:06 -03:00

..

src

Merge remote-tracking branch 'megalodon_main/main'

2023-02-17 17:40:06 -03:00

.gitignore

Fix volume buttons in photo viewer

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

build.gradle

bump version

2023-02-17 13:27:41 +01:00

proguard-rules.pro

Fix crash in ComposeFragment::onSaveInstanceState in release builds

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