You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nlpcraft.apache.org by se...@apache.org on 2020/05/08 11:38:28 UTC
[incubator-nlpcraft] 01/02: Merge branch 'master' into NLPCRAFT-30
This is an automated email from the ASF dual-hosted git repository.
sergeykamov pushed a commit to branch NLPCRAFT-30
in repository https://gitbox.apache.org/repos/asf/incubator-nlpcraft.git
commit a3d28614a699f62f0dd5e0adb8d6e01b9e3f7060
Merge: 6f5976a 440116e
Author: Sergey Kamov <se...@apache.org>
AuthorDate: Fri May 8 14:29:34 2020 +0300
Merge branch 'master' into NLPCRAFT-30
# Conflicts:
# NOTICE
.travis.yml | 19 -----
LICENSE | 53 +++++++++++-
NOTICE | 96 +---------------------
README.md | 4 +-
bin/prepare.sh | 3 +-
bindist/LICENSE | 53 +++++++++++-
bindist/NOTICE | 10 +++
openapi/README.md | 4 +-
pom.xml | 38 ++++++---
.../scala/org/apache/nlpcraft/examples/README.md | 4 +-
.../org/apache/nlpcraft/examples/alarm/README.md | 4 +-
.../org/apache/nlpcraft/examples/echo/README.md | 4 +-
.../apache/nlpcraft/examples/helloworld/README.md | 4 +-
.../apache/nlpcraft/examples/lightswitch/README.md | 4 +-
.../org/apache/nlpcraft/examples/phone/README.md | 4 +-
.../org/apache/nlpcraft/examples/time/README.md | 4 +-
.../org/apache/nlpcraft/examples/weather/README.md | 4 +-
17 files changed, 166 insertions(+), 146 deletions(-)