1abe28943c
# Conflicts: # app/src/main/res/values-fr/strings.xml # app/src/main/res/values-pt-rBR/strings.xml # app/src/main/res/values-zh-rCN/strings.xml # fastlane/metadata/android/pt-BR/changelogs/58.txt # fastlane/metadata/android/pt-BR/changelogs/61.txt # fastlane/metadata/android/pt-BR/changelogs/72.txt |
||
---|---|---|
.. | ||
schemas/com.keylesspalace.tusky.db.AppDatabase | ||
src | ||
.gitignore | ||
build.gradle | ||
proguard-rules.pro |