MISP
/
MISP
mirror of https://github.com/MISP/MISP
2
2
Fork 0
Code Issues Releases Wiki Activity

Merge branch '2.4' of https://github.com/MISP/MISP into 2.4

pull/1641/head
Iglocska 2016-10-31 20:31:17 +01:00
parent 073b650d56 c8a8818209
commit 17ed6f9309
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/View/Servers/edit.ctp
View File

@ -85,7 +85,7 @@
?>
<div class="clear">
<p>
<span class="bold">Server ceritificate file: </span>
<span class="bold">Server certificate file: </span>
<span id="serverEditCertValue">
<?php
if (isset($server['Server']['cert_file']) && !empty($server['Server']['cert_file'])) echo h($server['Server']['cert_file']);
@ -107,7 +107,7 @@
</div>
<div class="clear">
<p>
<span class="bold">Client ceritificate file: </span>
<span class="bold">Client certificate file: </span>
<span id="serverEditClientCertValue">
<?php
if (isset($server['Server']['client_cert_file']) && !empty($server['Server']['client_cert_file'])) echo h($server['Server']['client_cert_file']);

2
app/files/taxonomies

@ -1 +1 @@
Subproject commit c22a4c86ff265761aa4accd4e2d30d8347c71316
Subproject commit 0ce745a12fa46c36ee8e74c397e84e3659161e04