mirror of https://github.com/MISP/MISP
485c007b39
Conflicts: VERSION.json app/Lib/Tools/XMLConverterTool.php app/Model/Event.php app/Model/EventTag.php app/Model/TemplateElementAttribute.php app/Model/TemplateElementFile.php app/Model/TemplateElementText.php app/Model/ThreatLevel.php app/View/Attributes/index.ctp app/View/Elements/eventattribute.ctp app/View/Elements/eventattributerow.ctp app/View/Elements/global_menu.ctp app/View/Elements/side_menu.ctp app/View/Events/automation.ctp app/View/Events/index.ctp app/View/Pages/administration.ctp app/View/ShadowAttributes/index.ctp app/View/Tags/index.ctp |
||
---|---|---|
.. | ||
index.ctp | ||
view.ctp |