e5d9b56dd0
# Conflicts: # app/build.gradle # app/src/main/java/com/keylesspalace/tusky/components/compose/ComposeActivity.kt # app/src/main/java/com/keylesspalace/tusky/components/compose/ComposeViewModel.kt # app/src/main/java/com/keylesspalace/tusky/components/trending/TrendingFragment.kt # app/src/main/java/com/keylesspalace/tusky/entity/Status.kt # app/src/main/res/values-be/strings.xml # app/src/main/res/values-cy/strings.xml # app/src/main/res/values-de/strings.xml # app/src/main/res/values-es/strings.xml # app/src/main/res/values-gd/strings.xml # app/src/main/res/values-ja/strings.xml # app/src/main/res/values-lv/strings.xml # app/src/main/res/values-oc/strings.xml # app/src/main/res/values-sv/strings.xml # app/src/main/res/values-tr/strings.xml # app/src/main/res/values-vi/strings.xml # app/src/main/res/values-zh-rCN/strings.xml # app/src/main/res/values/donottranslate.xml # fastlane/metadata/android/en-US/images/phoneScreenshots/01_timeline.png # fastlane/metadata/android/en-US/images/phoneScreenshots/03_profile.png # fastlane/metadata/android/en-US/images/phoneScreenshots/04_favourites.png # fastlane/metadata/android/fa/full_description.txt # fastlane/metadata/android/sv/changelogs/58.txt # fastlane/metadata/android/sv/changelogs/67.txt # fastlane/metadata/android/sv/changelogs/72.txt # fastlane/metadata/android/sv/changelogs/77.txt # gradle/libs.versions.toml |
||
|---|---|---|
| .. | ||
| schemas/com.keylesspalace.tusky.db.AppDatabase | ||
| src | ||
| build.gradle | ||
| getGitSha.gradle | ||
| lint-baseline.xml | ||
| lint.xml | ||
| proguard-rules.pro | ||