tree c31afd5e898bc31947ac12fc4d4e3eb356949707
parent 8262bf038f3a7214c7629edab085e477345250be
parent a1324046e3c7ee38f0ff55c949b31d32d6fce3cd
author Sergey Kamov <sergeykamov@apache.org> 1603871292 +0300
committer Sergey Kamov <sergeykamov@apache.org> 1603871292 +0300

Merge branch 'master' into NLPCRAFT-160

# Conflicts:
#	nlpcraft/src/main/scala/org/apache/nlpcraft/examples/lightswitch/lightswitch_model.yaml