History for tampopo-client / app / src / main / java / com / example / tampopo_client / Tampopo.java

# Conflicts:
#	app/src/main/java/com/example/tampopo_client/Tampopo.java
#	app/src/main/java/com/example/tampopo_client/viewmodels/UserViewModel.java
#	app/src/main/java/com/example/tampopo_client/views/FriendListFragment.java

# Conflicts:
#	app/src/main/java/com/example/tampopo_client/Tampopo.java

プロフィール編集、アカウント編集、ログアウトまで