Merge branch 'develop' of http://blit.7drlb.com:8888/r/screen-frontend into...

fengxiang

2017-12-20 3963396bffa74454217500f5d56552a352968b40

 src/environments/environment.ts

@@ -7,5 +7,6 @@
    SERVER_URL: `./`,
    production: false,
    hmr: false,
    useHash: true
    useHash: true,
    SERVER_BASH_URL: 'http://localhost:8001'
};