Merge branch 'master' into changeAvtivitiesType

Fork: 0

nitta-lab-2025 / tampopo-client

Browse code Merge branch 'master' into changeAvtivitiesType # Conflicts: # app/src/main/java/com/example/tampopo_client/viewmodels/ActivityViewModel.java mainActivity_natty master
commit d24ac9f5fe0ce94b0c28ca5abbe26b10b57ed53f 2 parents 2629d4e + ce4b16c n-nitta authored 4 days ago

Patch

Unified Split

Showing 1 changed file

Ignore Space Show notes View app/src/main/java/com/example/tampopo_client/viewmodels/ActivityViewModel.java

Show line notes below