Merge with master branch

This commit is contained in:
ZeroC0D3 Team committed 2017-03-17 14:36:00 +07:00
1 parent 8de9eca8ae
commit 5c0933d19a
87 files changed
+1966 -1705

No files matched your search

+1 -1
View File
@@ -4,7 +4,7 @@
# Grab full name of php-fpm container
PHP_FPM_CONTAINER=$(docker-compose ps | grep php-fpm | cut -d " " -f 1)
PHP_FPM_CONTAINER=$(docker ps | grep php-fpm | awk '{print $1}')
# Grab OS type