Merge branch 'master' of github.com:elasticsearch/kibana
Conflicts: docs/kibana/configuration/config.js.asciidoc src/app/directives/configModal.js src/app/directives/kibanaPanel.js src/app/panels/filtering/module.html src/app/panels/query/module.html src/app/panels/query/query.css src/app/panels/table/editor.html src/app/panels/table/module.js src/app/partials/dashLoader.html src/app/partials/dashboard.html src/app/services/querySrv.js src/css/bootstrap.dark.min.css src/index.html tasks/docs_task.js
Showing
sample/lighttpd_basic.conf
0 → 100644
This source diff could not be displayed because it is too large.
You can
view the blob
instead.
This source diff could not be displayed because it is too large.
You can
view the blob
instead.
src/img/cubes.png
0 → 100644
22 KB
src/img/light.png
0 → 100644
13.8 KB
Please
register
or
sign in
to comment