Alexander Nozik 7fc27c49a3 Merge remote-tracking branch 'origin/dev' into dev ... # Conflicts: # build.gradle.kts # dataforge-magix-client/src/commonMain/kotlin/hep/dataforge/control/client/magixClient.kt # magix/magix-service/src/commonMain/kotlin/hep/dataforge/magix/service/RSocketMagixEndpoint.kt		2020-12-01 10:46:02 +03:00
..
src/commonMain/kotlin/hep/dataforge/control/client	Merge remote-tracking branch 'origin/dev' into dev	2020-12-01 10:46:02 +03:00
build.gradle.kts	Replace Scheme by data class in DeviceMessage	2020-11-05 11:29:40 +03:00