88c0985908
# Conflicts: # mastodon/build.gradle |
||
---|---|---|
.. | ||
src | ||
.editorconfig | ||
.gitignore | ||
build.gradle | ||
ci_signing.gradle | ||
proguard-rules.pro |
88c0985908
# Conflicts: # mastodon/build.gradle |
||
---|---|---|
.. | ||
src | ||
.editorconfig | ||
.gitignore | ||
build.gradle | ||
ci_signing.gradle | ||
proguard-rules.pro |