Merge remote-tracking branch 'origin/pt_refactor_managers' into pt_supabase_authentication
# Conflicts: # My project/Assets/Scenes/MCQ/OLD MSQ.unity # My project/Assets/ScienceStreet/CS/Scripts/CsGameManager.cs # My project/UserSettings/EditorUserSettings.asset # My project/UserSettings/Layouts/CurrentMaximizeLayout.dwlt
Showing
File moved
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
File deleted
10.7 KB
10.7 KB