• 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
..
InteractiveVideo Loading commit data...
WebGLTemplates Loading commit data...
__MACOSX Loading commit data...
InteractiveVideo.meta Loading commit data...
WebGLTemplates.meta Loading commit data...
__MACOSX.meta Loading commit data...