LucasGGamerM fd0a741ff2 Merge remote-tracking branch 'megalodon_main/main' ...

# Conflicts:
#	mastodon/src/main/java/org/joinmastodon/android/fragments/EditTimelinesFragment.java
#	mastodon/src/main/java/org/joinmastodon/android/model/TimelineDefinition.java

2023-06-21 15:50:10 -03:00

..

src

Merge remote-tracking branch 'megalodon_main/main'

2023-06-21 15:50:10 -03:00

.gitignore

Fix volume buttons in photo viewer

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

build.gradle

build: bump version

2023-06-16 13:04:11 -03:00

proguard-rules.pro

Merge remote-tracking branch 'megalodon_weblate/main'

2023-06-15 14:58:12 -03:00