Merge remote-tracking branch 'origin/NewUIv2' into NewUI
# Conflicts: # My project/Assets/App/Infrastructure/Core/AppRouter.cs # My project/Assets/AppUI/NewAppUI/Login.uxml # My project/Assets/AppUI/NewAppUI/Scene/Boot.unity # My project/ProjectSettings/ProjectVersion.txt
Showing
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
Please register or sign in to comment