LucasGGamerM 1beba48b66 Merge remote-tracking branch 'megalodon_weblate/main' ...

# Conflicts:
#	mastodon/build.gradle
#	mastodon/src/main/java/org/joinmastodon/android/model/TimelineDefinition.java
#	mastodon/src/main/res/values-pt-rBR/strings_sk.xml

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

3.1 KiB

Raw Blame History

View Raw