898cff1df3
# Conflicts: # app/src/main/res/values-gd/strings.xml |
||
---|---|---|
.. | ||
schemas/com.keylesspalace.tusky.db.AppDatabase | ||
src | ||
.gitignore | ||
build.gradle | ||
proguard-rules.pro |
898cff1df3
# Conflicts: # app/src/main/res/values-gd/strings.xml |
||
---|---|---|
.. | ||
schemas/com.keylesspalace.tusky.db.AppDatabase | ||
src | ||
.gitignore | ||
build.gradle | ||
proguard-rules.pro |