LucasGGamerM 6318745fe7 Merge remote-tracking branch 'megalodon_main/main' into m3-merger ...

# Conflicts:
#	mastodon/src/main/java/org/joinmastodon/android/fragments/discover/DiscoverAccountsFragment.java
#	mastodon/src/main/java/org/joinmastodon/android/fragments/onboarding/CustomWelcomeFragment.java
#	mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/AccountCardStatusDisplayItem.java

2023-08-27 13:51:42 -03:00

..

src

Merge remote-tracking branch 'megalodon_main/main' into m3-merger

2023-08-27 13:51:42 -03:00

.editorconfig

Merge upstream redesign (#714)

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

.gitignore

…

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