LucasGGamerM 2ef3e7eab7 Merge remote-tracking branch 'megalodon_main/main' ...

# Conflicts:
#	mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/PollFooterStatusDisplayItem.java

2023-11-28 14:31:42 -03:00

..

src

Merge remote-tracking branch 'megalodon_main/main'

2023-11-28 14:31:42 -03:00

.editorconfig

Merge upstream redesign (#714)

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

.gitignore

…

build.gradle

Merge remote-tracking branch 'megalodon_main/main'

2023-11-17 16:02:23 -03:00

proguard-rules.pro

Merge remote-tracking branch 'megalodon_weblate/main'

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