squash merge open933 into integration-1089, resolve merge conflicts.

2016-10-12 13:47:56 -07:00
parent 7b218c7f02
commit 65043d0ff3
76 changed files with 4955 additions and 358 deletions
--- a/platform/commonUI/general/res/sass/_data-status.scss
+++ b/platform/commonUI/general/res/sass/_data-status.scss
@@ -4,4 +4,3 @@
 		@include s-stale();
 	}
 }
-