LucasGGamerM fd5beba780 Merge remote-tracking branch 'megalodon_main/main' ... # Conflicts: # mastodon/build.gradle # mastodon/src/main/java/org/joinmastodon/android/fragments/StatusListFragment.java # mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/StatusDisplayItem.java # metadata/en-US/full_description.txt # metadata/ja-JP/title.txt		2023-10-28 10:46:33 -03:00
..
short_description.txt	Translated using Weblate (Japanese)	2023-10-26 16:39:24 +00:00
title.txt	Translated using Weblate (Japanese)	2023-10-26 16:39:24 +00:00