Skip to content

Giang son#19

Open
GSon02 wants to merge 15 commits into
masterfrom
GiangSon
Open

Giang son#19
GSon02 wants to merge 15 commits into
masterfrom
GiangSon

Conversation

@GSon02

@GSon02 GSon02 commented Nov 28, 2021

Copy link
Copy Markdown
Collaborator

No description provided.

huydo11 and others added 15 commits December 2, 2021 14:05
# Conflicts:
#	app/src/main/java/com/example/fmmusic/View/Activity/ProfileActivity.java
- Không sửa j hết
# Conflicts:
#	.idea/deploymentTargetDropDown.xml
#	.idea/misc.xml
- Không sửa j hết
# Conflicts:
#	.idea/deploymentTargetDropDown.xml
# Conflicts:
#	.idea/misc.xml
#	app/src/main/java/com/example/fmmusic/View/Activity/LoginActivity.java
#	app/src/main/java/com/example/fmmusic/View/Activity/ProfileActivity.java
#	app/src/main/java/com/example/fmmusic/View/Activity/SignUpActivity.java
# Conflicts:
#	.idea/deploymentTargetDropDown.xml
- Đã bảo là Không sửa j hết
-Thêm quản lý tài khoàn thông qua Account "Admin"
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants