-
Merge remote-tracking branch 'upstream/master' · 4aceb608
Conflicts: src/app/directives/kibanaPanel.js src/app/panels/bettermap/editor.html src/app/panels/bettermap/module.js src/app/panels/hits/editor.html src/app/panels/map/editor.html src/app/panels/pie/editor.html src/app/panels/table/module.html src/app/panels/table/pagination.html src/app/panels/terms/editor.html src/app/panels/terms/module.js src/app/partials/dasheditor.html src/css/bootstrap.dark.min.css
Torkel Ödegaard committed
| Name |
Last commit
|
Last Update |
|---|---|---|
| .. | ||
| less | Loading commit data... | |
| bootstrap.js | Loading commit data... |