Merge branch 'master' into dev

This commit is contained in:
Dessalines 2019-04-26 09:11:14 -07:00
commit 06861f3ec2
2 changed files with 6 additions and 0 deletions

View File

@ -1,2 +1,5 @@
#!/bin/sh
set -e
git pull git pull
docker-compose up -d --no-deps --build docker-compose up -d --no-deps --build

View File

@ -1,3 +1,6 @@
#!/bin/sh
set -e
cd ui cd ui
yarn yarn
yarn build yarn build