Merge branch 'master' into feature/800

Conflicts:
	bin/v-add-letsencrypt-user
This commit is contained in:
Derrick Hammer 2016-09-25 02:37:42 -04:00
commit 4daa17f54f
248 changed files with 6127 additions and 2139 deletions

View file

@ -12,7 +12,7 @@
# Argument definition
user=$1
email=$2
key_size=2048
key_size=4096
# Includes
source $VESTA/func/main.sh