merge with staging

2017-10-12 09:59:24 +06:30
parent 1f6c05b314 476aafa791
commit bc2101bf42
89 changed files with 1810 additions and 1372 deletions
--- a/config/sx.yml
+++ b/config/sx.yml
@@ -1,6 +1,6 @@
 development:
 server_mode: cloud #local
- sx_provision_url: http://192.168.1.75:3002/api
+ sx_provision_url: http://192.168.1.162:3005/api

 
 test:
@@ -11,3 +11,4 @@ test:
 production:
 server_mode: cloud 
 sx_provision_url: secure.smartsales.asia/api 
+