LucasGGamerM 61b20eea05 Merge remote-tracking branch 'megalodon_main/main' ...

# Conflicts:
#	mastodon/src/main/java/org/joinmastodon/android/GlobalUserPreferences.java
#	mastodon/src/main/java/org/joinmastodon/android/model/Account.java

2023-09-05 07:12:27 -03:00

..

src

Merge remote-tracking branch 'megalodon_main/main'

2023-09-05 07:12:27 -03:00

.editorconfig

Merge upstream redesign (#714)

2023-07-16 18:01:42 +02:00

.gitignore

Fix volume buttons in photo viewer

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

build.gradle

boop versinom

2023-08-24 12:12:55 +02:00

proguard-rules.pro

Merge remote-tracking branch 'megalodon_weblate/main'

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