LucasGGamerM afc401c1f2 Merge remote-tracking branch 'megalodon_main/main' into m3-merger ... # Conflicts: # mastodon/build.gradle # mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/FooterStatusDisplayItem.java # mastodon/src/main/res/values-pl-rPL/strings_sk.xml # mastodon/src/main/res/values-ru-rRU/strings_sk.xml # metadata/ru/full_description.txt		2023-08-24 08:17:57 -03:00
..
changelogs	Merge remote-tracking branch 'megalodon_main/main' into m3-merger	2023-08-24 08:17:57 -03:00
short_description.txt	…
title.txt	…