malbarral 15fe4a8f70 Merge branch '3.0' of github.com:wazuh/wazuh-kibana-app-dev into formatting-os-name-92 ... Conflicts: public/templates/agents-overview.html		2017-08-10 16:37:20 +02:00
..
main.less	Merge branch '3.0' of github.com:wazuh/wazuh-kibana-app-dev into formatting-os-name-92	2017-08-10 16:37:20 +02:00
ui_framework.less	Fixing styles, controller and template	2017-07-20 10:32:59 +02:00