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/res/templates/clock.html
+++ b/platform/features/clock/res/templates/clock.html
@@ -31,4 +31,4 @@
 	        {{clock.ampm()}}
 	    </span>
 	</div>
-</div>
+</div>
--- a/platform/features/clock/res/templates/timer.html
+++ b/platform/features/clock/res/templates/timer.html
@@ -36,4 +36,4 @@
 	    </span>
 	    <span ng-controller="RefreshingController"></span>
 	</div>
-</div>
+</div>