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 |
|
kyori19
|
6c630e08dd
|
Merge remote-tracking branch 'tuskyapp/develop'
|
2022-04-24 16:42:54 +09:00 |
|
kyori19
|
2005b32dfa
|
Merge remote-tracking branch 'tuskyapp/develop'
|
2021-07-03 23:59:57 +09:00 |
|
kyori19
|
609dcf46cb
|
Merge remote-tracking branch 'tuskyapp/develop'
|
2021-04-28 11:54:29 +09:00 |
|
kyori19
|
025ba68df4
|
Refactor quick compose
* Stash visibility while composing reply
* Remove announcements
|
2020-09-08 02:04:56 +09:00 |
|
kyori19
|
ca65c5e26f
|
Merge remote-tracking branch 'tuskyapp/develop'
|
2020-05-04 10:52:47 +09:00 |