Merge branch 'master' of http://nitta-lab-www.is.konan-u.ac.jp/gitbucket/git/nitta-lab-2025/tampopo-client into mainActivity_natty
commit 386a6068a800913766fbc6fe4a44bbaf7959cb14
2 parents c791975 + 0cc162c
n-morii authored 6 days ago
Showing 4 changed files
View
app/src/main/java/com/example/tampopo_client/Tampopo.java
View
app/src/main/java/com/example/tampopo_client/views/ChatActivity.java 0 → 100644
View
app/src/main/res/drawable/phone.png 0 → 100644
View
app/src/main/res/layout/activity_chat.xml 0 → 100644