Merge branch 'open-master' into open1223

Conflicts: platform/features/plot/res/templates/plot.html
2015-06-19 13:34:21 -07:00
parent de3c6e4543 dbd7a65a7a
commit 3b62add011
103 changed files with 6015 additions and 1607 deletions
--- a/platform/telemetry/src/TelemetryFormatter.js
+++ b/platform/telemetry/src/TelemetryFormatter.js
@@ -22,8 +22,8 @@
 /*global define,moment*/

 define(
-    ['../lib/moment.min.js'],
-    function () {
+    ['moment'],
+    function (moment) {
        "use strict";

        // Date format to use for domain values; in particular,