You cannot select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
Yuito-app-android/app
kyori19 e5d9b56dd0
Merge remote-tracking branch 'tuskyapp/develop'
# 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
2 months ago
..
schemas/com.keylesspalace.tusky.db.AppDatabase Merge remote-tracking branch 'tuskyapp/develop' 4 months ago
src Merge remote-tracking branch 'tuskyapp/develop' 2 months ago
build.gradle Merge remote-tracking branch 'tuskyapp/develop' 2 months ago
getGitSha.gradle Previous attempt to fix git sha on non-git build broke git build. (#3322) 7 months ago
lint-baseline.xml Fix lint issues in AppDatabase.java (#3809) 3 months ago
lint.xml Set OldTargetApi to a warning (#3836) 2 months ago
proguard-rules.pro Remove shrinker rules for okhttp (#3560) 5 months ago