malbarral a68b80e4cb Merge branch '2.1' of github.com:wazuh/wazuh-kibana-app-dev into loading-icon-17 ... Conflicts: public/controllers/agentsPreview.js public/directives/kibanaVisualizationDirective.js public/less/main.less public/objects/genericReq.js public/objects/testConnection.js public/templates/agents-audit.html public/templates/agents-fim.html public/templates/agents-oscap.html public/templates/agents-overview.html public/templates/agents-pci.html public/templates/agents-pm.html public/templates/overview-audit.html public/templates/overview-fim.html public/templates/overview-general.html public/templates/overview-oscap.html public/templates/overview-pci.html public/templates/overview-pm.html		2017-08-02 19:05:11 +02:00
..
main.less	Merge branch '2.1' of github.com:wazuh/wazuh-kibana-app-dev into loading-icon-17	2017-08-02 19:05:11 +02:00
ui_framework.less	Fixing styles, controller and template	2017-07-20 10:32:59 +02:00