[CONFLICT CHUNKS] Merge branch 'develop' into travis/sourcemaps-develop

2020-01-09 14:15:09 -07:00
parent 6ca9a7c998 d40091afc5
commit fde32f13a5
190 changed files with 6185 additions and 2225 deletions
@@ -53,6 +53,10 @@ limitations under the License.
            mask-image: url('$(res)/img/feather-customised/home.svg');
        }

+        .mx_TopLeftMenu_icon_help::after {
+            mask-image: url('$(res)/img/feather-customised/life-buoy.svg');
+        }
+
        .mx_TopLeftMenu_icon_settings::after {
            mask-image: url('$(res)/img/feather-customised/settings.svg');
        }