LucasGGamerM e694715dae Merge branch 'bugfix/965' ...

# Conflicts:
#	mastodon/src/main/AndroidManifest.xml

2024-03-17 16:25:49 -03:00

..

src

Merge branch 'bugfix/965'

2024-03-17 16:25:49 -03:00

.editorconfig

Merge upstream redesign (#714)

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

.gitignore

…

build.gradle

chore(merging-upstream): bunch of conflicts to solve

2024-02-14 21:08:16 -03:00

proguard-rules.pro

chore(merging-upstream): bunch of conflicts to solve

2024-02-14 21:08:16 -03:00