Merge branch 'MDL-64649-36' of https://github.com/felicemcc/moodle in…

…to MOODLE_36_STABLE
moodle · Feb 4, 2019 · 0b0b26f · 0b0b26f
2 parents 3de8463 + 2c7a567
commit 0b0b26f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/lib/amd/build/icon_system_fontawesome.min.js b/lib/amd/build/icon_system_fontawesome.min.js
diff --git a/lib/amd/src/icon_system_fontawesome.js b/lib/amd/src/icon_system_fontawesome.js
@@ -105,7 +105,8 @@ define(['core/icon_system', 'jquery', 'core/ajax', 'core/mustache', 'core/locals
             unmappedIcon: unmappedIcon
         };
 
-        return Mustache.render(template, context);
+        var result = Mustache.render(template, context);
+        return result.trim();
     };
 
     /**