Merge branch 'work' of...
Merge branch 'work' of https://gitlab.fsi.hochschule-trier.de/GameDevWeek/ws-18_19/unity/explosive-temper into work # Conflicts: # ProjectSettings/EditorBuildSettings.asset
Showing
Assets/Credits.cs
0 → 100644
Assets/Credits.cs.meta
0 → 100644