Merge branch 'master' into fix/596

2019-03-06 18:25:42 +03:00
parent 1b15bee2b0 7ec4aa91ea
commit bc4c2e2ff7
12 changed files with 459 additions and 319 deletions
--- a/client/src/reducers/encryption.js
+++ b/client/src/reducers/encryption.js
@@ -70,6 +70,7 @@ const encryption = handleActions({
    valid_chain: false,
    valid_key: false,
    valid_cert: false,
+    valid_pair: false,
    status_cert: '',
    status_key: '',
    certificate_chain: '',