kyori19 57aab71b0e Merge remote-tracking branch 'tuskyapp/develop' ... # Conflicts: # app/build.gradle # app/src/main/java/com/keylesspalace/tusky/SplashActivity.kt # app/src/main/java/com/keylesspalace/tusky/adapter/StatusDetailedViewHolder.java # app/src/main/java/com/keylesspalace/tusky/components/compose/ComposeViewModel.kt # app/src/main/java/com/keylesspalace/tusky/components/compose/MediaUploader.kt # app/src/main/java/com/keylesspalace/tusky/components/conversation/ConversationViewHolder.java # app/src/main/java/com/keylesspalace/tusky/components/search/SearchViewModel.kt # app/src/main/java/com/keylesspalace/tusky/components/timeline/TimelineTypeMappers.kt # app/src/main/java/com/keylesspalace/tusky/components/timeline/viewmodel/CachedTimelineViewModel.kt # app/src/main/res/layout/activity_main.xml # app/src/main/res/values-cs/strings.xml # app/src/main/res/values-de/strings.xml # app/src/main/res/values-fa/strings.xml # app/src/main/res/values-fr/strings.xml # app/src/main/res/values-hu/strings.xml # app/src/main/res/values-it/strings.xml # app/src/main/res/values-no-rNB/strings.xml # app/src/main/res/values-zh-rCN/strings.xml		2022-07-16 02:51:51 +09:00
..
schemas/com.keylesspalace.tusky.db.AppDatabase	Merge remote-tracking branch 'tuskyapp/develop'	2022-07-16 02:51:51 +09:00
src	Merge remote-tracking branch 'tuskyapp/develop'	2022-07-16 02:51:51 +09:00
.gitignore	Adds a forgotten keystore.	2017-06-02 04:47:22 -04:00
build.gradle	Merge remote-tracking branch 'tuskyapp/develop'	2022-07-16 02:51:51 +09:00
proguard-rules.pro	Merge remote-tracking branch 'tuskyapp/develop'	2022-05-19 21:13:56 +09:00