Merge remote-tracking branch 'origin/master'

# Conflicts: # config.js # ssl/ca.cnf # ssl/create.sh # ssl/server.cnf
2020-02-22 02:37:17 +01:00 · 2020-02-22 02:37:17 +01:00 · 2e58f60b88
commit 2e58f60b88
parent f53a42335b 4989c2b6bc
2 changed files with 1 additions and 0 deletions
--- a/ssl/cert/index.txt
+++ b/ssl/cert/index.txt
--- a/ssl/cert/serial
+++ b/ssl/cert/serial
@ -0,0 +1 @@
+00