Skip to content
Snippets Groups Projects
Commit cdc4bf80 authored by wiepke's avatar wiepke
Browse files

Merge branch 'CleaningDevelopment' of...

Merge branch 'CleaningDevelopment' of https://gitup.uni-potsdam.de/mm_vr/vr-klassenzimmer into CleaningDevelopment

# Conflicts:
#	Assets/Scenes/MediaRoom.unity
parents 79cdfb35 77f9af91
No related branches found
No related tags found
No related merge requests found
Showing
with 127 additions and 69 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