kyori19 4f705ae074 Merge remote-tracking branch 'tuskyapp/main' ... # Conflicts: # app/build.gradle # app/src/main/java/com/keylesspalace/tusky/components/compose/ComposeViewModel.kt		2023-06-10 01:02:01 +09:00
..
java	Merge remote-tracking branch 'tuskyapp/main'	2023-06-10 01:02:01 +09:00
res	Merge remote-tracking branch 'tuskyapp/main'	2023-06-10 01:02:01 +09:00
AndroidManifest.xml	Merge remote-tracking branch 'tuskyapp/develop'	2023-06-02 00:54:05 +09:00
ic_launcher-web.png	new app icon (#2695)	2022-09-13 19:48:09 +02:00