88c0985908
# Conflicts: # mastodon/build.gradle |
||
---|---|---|
.. | ||
androidTest | ||
appcenter/java/org/joinmastodon/android | ||
github | ||
main |
88c0985908
# Conflicts: # mastodon/build.gradle |
||
---|---|---|
.. | ||
androidTest | ||
appcenter/java/org/joinmastodon/android | ||
github | ||
main |