LucasGGamerM 58be2214a4 Merge remote-tracking branch 'mastodon/master' ...

# Conflicts:
#	mastodon/build.gradle
#	mastodon/src/main/java/org/joinmastodon/android/fragments/ProfileFragment.java

2023-09-28 15:19:32 -03:00

..

src

Merge remote-tracking branch 'mastodon/master'

2023-09-28 15:19:32 -03:00

.editorconfig

Merge upstream redesign (#714)

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

.gitignore

…

build.gradle

Merge remote-tracking branch 'mastodon/master'

2023-09-28 15:19:32 -03:00

proguard-rules.pro

Merge remote-tracking branch 'megalodon_weblate/main'

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