fcd997f36c
# Conflicts: # app/src/main/res/values-es/strings.xml # app/src/main/res/values-gl/strings.xml |
||
---|---|---|
.. | ||
schemas/com.keylesspalace.tusky.db.AppDatabase | ||
src | ||
build.gradle | ||
getGitSha.gradle | ||
lint-baseline.xml | ||
lint.xml | ||
proguard-rules.pro |