Skip to content
Snippets Groups Projects
Commit 2cf0380b authored by Falampe's avatar Falampe
Browse files

Merge remote-tracking branch 'origin/CleaningDevelopment' into...

Merge remote-tracking branch 'origin/CleaningDevelopment' into Enable_hardcoded_presentation_for_French_Class

# Conflicts:
#	Packages/vr.teachr.displays/Runtime/Scripts/PresentationController.cs
#	Packages/vr.teachr.structuretree/Runtime/Scripts/ImpulseController.cs
parents 73ecf7ea af66a12e
No related branches found
No related tags found
No related merge requests found
Showing
with 26 additions and 2 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment