LucasGGamerM 1e2dd3dec6 Merge remote-tracking branch 'megalodon_main/main' ... # Conflicts: # mastodon/build.gradle # mastodon/src/main/java/org/joinmastodon/android/fragments/BaseStatusListFragment.java # mastodon/src/main/java/org/joinmastodon/android/fragments/ProfileFragment.java # mastodon/src/main/java/org/joinmastodon/android/fragments/SettingsFragment.java # mastodon/src/main/java/org/joinmastodon/android/ui/utils/UiUtils.java		2023-02-17 17:40:06 -03:00
..
changelogs	Merge remote-tracking branch 'megalodon_main/main'	2023-02-17 17:40:06 -03:00
images	Merge branch 'main'	2023-02-07 16:04:28 -03:00
full_description.txt	Updating the description	2023-02-16 17:39:51 -03:00
short_description.txt	Translated using Weblate (English)	2023-01-17 00:57:46 +00:00
title.txt	Translated using Weblate (English)	2023-01-17 00:57:46 +00:00