Merge branch 'develop' into 3.x-develop

aebadirad · aebadirad · commit 60a5096e6ece · 2018-04-25T10:17:36.000-07:00
# Conflicts:
#	quick-start/src/main/ui/styles.scss
diff --git a/quick-start/src/main/ui/styles.scss b/quick-start/src/main/ui/styles.scss
@@ -1,6 +1 @@
 /* You can add global styles to this file, and also import other style files */
-
-.mdl-dialog__content {
-  white-space: pre;
-}
-
