LucasGGamerM 4bb0597edf Merge remote-tracking branch 'mastodon/master' ...

# Conflicts:
#	mastodon/build.gradle

2023-09-29 07:56:14 -03:00

..

src

Merge remote-tracking branch 'mastodon/master'

2023-09-29 07:56:14 -03:00

.editorconfig

Merge upstream redesign (#714)

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

.gitignore

…

build.gradle

Same crash fix in 2 more places ugh

2023-09-29 03:20:58 +03:00

proguard-rules.pro

Merge remote-tracking branch 'megalodon_weblate/main'

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