Merge branch 'master' of github.com:elasticsearch/kibana

Browse Source

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

...

This commit is contained in:

Torkel Ödegaard

2013-12-30 09:44:19 +01:00

parent 3f9cb80390 a13f6e0e60

commit 24e624ba63

32 changed files with 2978 additions and 653 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

src/css/bootstrap.dark.min.css

Vendored

+1 -1

File diff suppressed because one or more lines are too long