ろむねこ db83de7a37 Merge branch 'main' into parent_swipe ... # Conflicts: # feature/parent/src/main/java/one/nem/kidshift/feature/parent/ParentMainFragment.java # feature/parent/src/main/res/layout/fragment_parent_main.xml # feature/setting/src/main/java/one/nem/kidshift/feature/setting/SettingMainFragment.java # gradle/libs.versions.toml		2024-07-02 14:13:44 +09:00
..
wrapper	Init	2024-06-05 14:36:41 +09:00
libs.versions.toml	Merge branch 'main' into parent_swipe	2024-07-02 14:13:44 +09:00