1e2dd3dec6
# 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 |
||
---|---|---|
.. | ||
changelogs | ||
full_description.txt | ||
short_description.txt | ||
title.txt |