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