1. 30 Dec, 2013 1 commit
    • Merge branch 'master' of github.com:elasticsearch/kibana · 24e624ba
      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
      Torkel Ödegaard committed
  2. 29 Dec, 2013 12 commits
  3. 28 Dec, 2013 5 commits
  4. 27 Dec, 2013 7 commits
  5. 26 Dec, 2013 10 commits
  6. 25 Dec, 2013 4 commits
  7. 24 Dec, 2013 1 commit