Torkel Ödegaard 2ea548850e Merge branch 'master' into style-changes-bulletfactory ... Conflicts: pkg/api/index.go public/less/sidemenu.less		2016-02-11 21:23:54 +01:00
..
navbar	feat(): removed unused routes and minor fixes	2016-02-08 16:57:29 +01:00
search	fix(search); fixes to dashboard search (using keyboard), and fix for singlestat in snapshot view	2016-02-05 13:48:10 +01:00
sidemenu	Merge branch 'master' into style-changes-bulletfactory	2016-02-11 21:23:54 +01:00
grafana_app.ts	fix(search); fixes to dashboard search (using keyboard), and fix for singlestat in snapshot view	2016-02-05 13:48:10 +01:00