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/commonUI/general/res/sass/features/_imagery.scss
+++ b/platform/commonUI/general/res/sass/features/_imagery.scss
@@ -199,4 +199,4 @@
 	.l-image-thumbs-wrapper {
 		display: none;
 	}
-}
+}