25bee533f1
# Conflicts: # app/build.gradle # app/src/main/java/com/keylesspalace/tusky/MainActivity.kt # app/src/main/java/com/keylesspalace/tusky/entity/Account.kt # app/src/main/res/values-zh-rCN/strings.xml # app/src/main/res/values-zh-rTW/strings.xml # app/src/main/res/values/strings.xml |
||
---|---|---|
.. | ||
actions.xml | ||
attrs.xml | ||
colors.xml | ||
dimens.xml | ||
donottranslate.xml | ||
ic_launcher_background.xml | ||
ids.xml | ||
integers.xml | ||
string-arrays.xml | ||
strings.xml | ||
styles.xml | ||
theme_colors.xml | ||
toot_button.xml |