• saad's avatar
    Merge branch 'mcq_edit' into pt_CS_saad · 7b654ffa
    saad authored
    # Conflicts:
    #	My project/Assets/Prefabs/CS/Canvas.prefab
    #	My project/Assets/ScienceStreet/CS/Scripts/CsUIManager.cs
    #	My project/Assets/WebGLTemplates.meta
    #	My project/Assets/WebGLTemplates/InteractiveVideo/Logo.png
    #	My project/Assets/WebGLTemplates/InteractiveVideo/index.html
    #	My project/Assets/WebGLTemplates/InteractiveVideo/index.html.meta
    #	My project/UserSettings/EditorUserSettings.asset
    #	My project/UserSettings/Layouts/CurrentMaximizeLayout.dwlt
    #	My project/UserSettings/Layouts/default-6000.dwlt
    7b654ffa
Name
Last commit
Last update
..
.idea/.idea.My project/.idea Loading commit data...
.vscode Loading commit data...
Assets Loading commit data...
CS Build Loading commit data...
Packages Loading commit data...
ProjectSettings Loading commit data...
UserSettings Loading commit data...
web Loading commit data...
.vsconfig Loading commit data...
My project.slnx Loading commit data...
create_sciencestreet_structure.sh Loading commit data...