LucasGGamerM 665a0176b9 Merge remote-tracking branch 'megalodon_main/main' ...

# Conflicts:
#	mastodon/build.gradle
#	mastodon/src/main/res/layout/fragment_splash.xml

2023-04-14 14:27:42 -03:00

..

com/twitter/twittertext

Better char counter and custom emoji in compose

2022-02-02 09:40:29 +03:00

org/joinmastodon/android

Merge remote-tracking branch 'megalodon_main/main'

2023-04-14 14:27:42 -03:00