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:
1
metadata/ja-JP/short_description.txt
Normal file
1
metadata/ja-JP/short_description.txt
Normal file
@@ -0,0 +1 @@
|
||||
ピンクなAndroid版Mastodonアプリですが、様々な機能が追加されています
|
||||
Reference in New Issue
Block a user