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
This commit is contained in:
LucasGGamerM
2023-10-28 10:46:33 -03:00
38 changed files with 891 additions and 646 deletions

View File

@@ -0,0 +1 @@
ピンクなAndroid版Mastodonアプリですが、様々な機能が追加されています