Merge remote-tracking branch 'origin/master' into develop

This commit is contained in:
Torkel Ödegaard
2015-03-05 12:26:08 +01:00
-1
View File
@@ -370,7 +370,6 @@ function (angular, $, kbn, moment, _, GraphTooltip) {
if (min && max && ticks) {
var secPerTick = ((max - min) / ticks) / 1000;
console.log('secPerTick', secPerTick);
if (secPerTick <= 45) {
return "%H:%M:%S";
}