Merge remote-tracking branch 'origin/victorsam/demo' into victorsam/demo

# Conflicts:
#	demo/src/main/kotlin/ru/mipt/npm/controls/demo/virtual_car/VirtualCar.kt
#	demo/src/main/kotlin/ru/mipt/npm/controls/demo/virtual_car/VirtualCarController.kt
This commit is contained in:
Atos1337 2021-10-28 11:17:45 +03:00
commit c1a1b6e696

Diff Content Not Available