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 |
||
---|---|---|
.. | ||
AccountDao.kt | ||
AccountEntity.kt | ||
AccountManager.kt | ||
AppDatabase.java | ||
ConversationsDao.kt | ||
Converters.kt | ||
DraftDao.kt | ||
DraftEntity.kt | ||
InstanceDao.kt | ||
InstanceEntity.kt | ||
TimelineDao.kt | ||
TimelineStatusEntity.kt |