Merge branch 'develop' into feature/role

weni-ai · Jun 27, 2018 · 7e29675 · 7e29675
2 parents 816547e + 8d7461f
commit 7e29675
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/README.md b/README.md
@@ -1,6 +1,6 @@
 # Bothub
 
-[![Build Status](https://travis-ci.org/push-flow/bothub.svg?branch=master)](https://travis-ci.org/push-flow/bothub) [![Coverage Status](https://coveralls.io/repos/github/push-flow/bothub/badge.svg?branch=master)](https://coveralls.io/github/push-flow/bothub?branch=master) [![Python Version](https://img.shields.io/badge/python-3.6-blue.svg)](https://www.python.org/) [![License GPL-3.0](https://img.shields.io/badge/license-%20GPL--3.0-yellow.svg)](https://github.com/push-flow/bothub/blob/master/LICENSE)
+[![Build Status](https://travis-ci.org/push-flow/bothub.svg?branch=master)](https://travis-ci.org/push-flow/bothub) [![Coverage Status](https://coveralls.io/repos/github/push-flow/bothub/badge.svg?branch=master)](https://coveralls.io/github/push-flow/bothub?branch=master) [![Python Version](https://img.shields.io/badge/python-3.6-blue.svg)](https://www.python.org/) [![License GPL-3.0](https://img.shields.io/badge/license-%20GPL--3.0-yellow.svg)](https://github.com/Ilhasoft/bothub-engine/blob/master/LICENSE)
 
 ## Development
 
@@ -20,7 +20,7 @@ Use ```make``` commands to ```check_environment```, ```install_requirements```,
 
 ### Fill database using fake data
 
-Run ```pipenv run python ./manage.py fill_db_using_fake_data``` to fill database using fake data. This can help you to test [Bothub Webapp](https://github.com/push-flow/bothub-webapp).
+Run ```pipenv run python ./manage.py fill_db_using_fake_data``` to fill database using fake data. This can help you to test [Bothub Webapp](https://github.com/Ilhasoft/bothub-webapp).
 
 
 #### Fake users infos:
@@ -67,6 +67,6 @@ You can set environment variables in your OS, write on ```.env``` file or pass v
 
 | Variable | Type | Default | Description |
 |--|--|--|--|
-| WEBAPP_REPO | ```string``` | ```https://github.com/push-flow/bothub-webapp``` | Git repository URL. It will clone and run ```npm install && npm run build``` command on the entrypoint. This build is served by Nginx.
+| WEBAPP_REPO | ```string``` | ```https://github.com/Ilhasoft/bothub-webapp``` | bothub-webapp git repository URL. It will clone and run ```npm install && npm run build``` command on the entrypoint. This build is served by Nginx.
 | WEBAPP_BRANCH | ```string``` | ```master``` | Specify the branch of the bothub-webapp Git repository.
 | API_BASE_URL | ```string``` | Not defined | The bothub production application URL. Used by ```bothub-webapp``` application.
diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
@@ -28,6 +28,6 @@ services:
       - CSRF_COOKIE_SECURE
       - BOTHUB_WEBAPP_BASE_URL
       - BOTHUB_NLP_BASE_URL
-      - WEBAPP_REPO=https://github.com/push-flow/bothub-webapp
+      - WEBAPP_REPO=https://github.com/Ilhasoft/bothub-webapp
       - WEBAPP_BRANCH=master
       - API_BASE_URL
diff --git a/setup.py b/setup.py
@@ -3,7 +3,7 @@
 
 setup(
     name='bothub',
-    version='1.8.8',
+    version='1.9.0',
     description='bothub',
     packages=find_packages(),
     install_requires=[