Merge remote-tracking branch 'origin/master'

# Conflicts:
#	config.js
#	ssl/ca.cnf
#	ssl/create.sh
#	ssl/server.cnf
This commit is contained in:
simon 2020-02-22 02:37:17 +01:00
commit 2e58f60b88
2 changed files with 1 additions and 0 deletions

0
ssl/cert/index.txt Normal file
View File

1
ssl/cert/serial Normal file
View File

@ -0,0 +1 @@
00