Merge pull request #21983 from admiralsmaster/master

Flot: Add timezone, timeformat, twelveHourClock to axisOptions

types/flot/index.d.ts

@@ -1,6 +1,8 @@
 // Type definitions for Flot
 // Project: http://www.flotcharts.org/
-// Definitions by: Matt Burland <https://github.com/burlandm>, Timo Mühlbach <https://github.com/Anticom>
+// Definitions by:  Matt Burland <https://github.com/burlandm>
+//                  Timo Mühlbach <https://github.com/Anticom>
+//                  Ariel Kuechler <https://github.com/admiralsmaster> 
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
 
@@ -120,6 +122,10 @@ declare namespace jquery.flot {
         tickLength?: number;
 
         alignTicksWithAxis?: number;
+        
+        timezone?: string;                      // "browser" or timezone (only makes sense for mode: "time")
+        timeformat?: string;                    // null or format string
+        twelveHourClock?: boolean;
     }
 
     interface seriesTypeBase {