Merge branch 'master' of github.com:torkelo/grafana-private into develop

This commit is contained in:
Torkel Ödegaard
2015-02-05 10:56:59 +01:00
+2 -1
View File
@@ -509,7 +509,8 @@ function($, _, moment) {
submenu: [
{text: 'bits', value: 'bits'},
{text: 'bytes', value: 'bytes'},
{text: 'kilobytes', value: 'kbytes'},
{text: 'kilo bytes', value: 'kbytes'},
{text: 'mega bytes', value: 'mbytes'},
]
},
{