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

pull/881/head
Iglocska 2016-01-26 09:55:55 +01:00
commit 4cb99afa29
1 changed files with 3 additions and 3 deletions

View File

@ -134,9 +134,9 @@ class Attribute extends AppModel {
'target-user' => array('desc' => 'Attack Targets Username(s)'),
'target-email' => array('desc' => 'Attack Targets Email(s)'),
'target-machine' => array('desc' => 'Attack Targets Machine Name(s)'),
'target-org' => array('desc' => 'Attack Targets Department or Orginization(s)'),
'target-location' => array('desc' => 'Attack Targets Physical Location(s)'),
'target-external' => array('desc' => 'External Target Orginizations Affected by this Attack'),
'target-org' => array('desc' => 'Attack Targets Department or Organization(s)'),
'target-location' => array('desc' => 'Attack Targets Physical Location(s)'),
'target-external' => array('desc' => 'External Target Organizations Affected by this Attack'),
'btc' => array('desc' => 'Bitcoin Address'),//
'iban' => array('desc' => 'International Bank Account Number'),//
'bic' => array('desc' => 'Bank Identifier Code Number'),