kyori19 1abe28943c Merge remote-tracking branch 'tuskyapp/develop' ... # Conflicts: # app/src/main/res/values-fr/strings.xml # app/src/main/res/values-pt-rBR/strings.xml # app/src/main/res/values-zh-rCN/strings.xml # fastlane/metadata/android/pt-BR/changelogs/58.txt # fastlane/metadata/android/pt-BR/changelogs/61.txt # fastlane/metadata/android/pt-BR/changelogs/72.txt		2022-03-08 08:03:21 +09:00
..
java	Merge remote-tracking branch 'tuskyapp/develop'	2022-03-08 08:03:21 +09:00
res	Merge remote-tracking branch 'tuskyapp/develop'	2022-03-08 08:03:21 +09:00
AndroidManifest.xml	Merge remote-tracking branch 'tuskyapp/develop'	2022-03-04 17:51:25 +09:00
ic_launcher-web.png	new launcher icon, new adaptive icon	2017-10-19 14:06:52 +02:00
ic_launcher.svg	new launcher icon, new adaptive icon	2017-10-19 14:06:52 +02:00