2dae00800e
# Conflicts: # mastodon/src/main/res/values/strings.xml |
||
---|---|---|
.. | ||
src | ||
.editorconfig | ||
.gitignore | ||
build.gradle | ||
ci_signing.gradle | ||
proguard-rules.pro |
2dae00800e
# Conflicts: # mastodon/src/main/res/values/strings.xml |
||
---|---|---|
.. | ||
src | ||
.editorconfig | ||
.gitignore | ||
build.gradle | ||
ci_signing.gradle | ||
proguard-rules.pro |