public/grafana
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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
Download Patch File Download Diff File Expand all files Collapse all files
src/app/partials/dasheditor.html
+1 -1
View File
@@ -35,7 +35,7 @@
<div class="row-fluid">
<div class="span8">
<h4>Rows</h4>
<table class="table table-condensed table-bordered">
<table class="table table-striped">
<thead>
<th width="1%"></th>
<th width="1%"></th>