Merge branch 'master' into open-623

2017-04-29 17:10:27 -05:00
parent 5aa93ba50c 1d7d963a4f
commit 8fb9306272
1011 changed files with 7691 additions and 4905 deletions
--- a/platform/features/clock/test/controllers/TimerControllerSpec.js
+++ b/platform/features/clock/test/controllers/TimerControllerSpec.js
@@ -91,6 +91,7 @@ define(
                        'timer.stop': mockStop
                    }[k]];
                });
+
                mockStart.getMetadata.andReturn({cssclass: "icon-play", name: "Start"});
                mockPause.getMetadata.andReturn({cssclass: "icon-pause", name: "Pause"});
                mockStop.getMetadata.andReturn({cssclass: "icon-box", name: "Stop"});