Merge branch 'master' into michishitaEdit
commit 946dddabca0a63fba2d9f1e886cb756fd9777efb
2 parents bd6a66f + d877175
s-michishita authored on 20 Jul 2021
Showing 2 changed files
View
app/src/main/res/menu/bottom_nav_menu.xml
View
app/src/main/res/values/strings.xml