LucasGGamerM 823344dfc0 Merge branch 'feat/mutes-list' ...

# Conflicts:
#	mastodon/src/main/res/menu/profile_own.xml
#	mastodon/src/main/res/values/strings_sk.xml

2023-09-17 10:09:02 -03:00

..

src

Merge branch 'feat/mutes-list'

2023-09-17 10:09:02 -03:00

.editorconfig

Merge upstream redesign (#714)

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

.gitignore

…

build.gradle

boop verison

2023-09-08 22:19:41 +02:00

proguard-rules.pro

Merge remote-tracking branch 'megalodon_weblate/main'

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