KidShift/feature/setting
ろむねこ 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
..
src Merge branch 'main' into parent_swipe 2024-07-02 14:13:44 +09:00
.gitignore :feature:setting モジュール作成 2024-06-05 14:52:08 +09:00
build.gradle 親の名前出したよ 2024-06-28 11:53:16 +09:00
consumer-rules.pro :feature:setting モジュール作成 2024-06-05 14:52:08 +09:00
proguard-rules.pro :feature:setting モジュール作成 2024-06-05 14:52:08 +09:00