diff options
| author | Filipa Lacerda <filipa@gitlab.com> | 2017-03-09 20:39:26 +0300 |
|---|---|---|
| committer | DJ Mountney <david@twkie.net> | 2017-03-11 00:11:35 +0300 |
| commit | 0383b9952b3836881e826ffa1504c8243e4d9f6b (patch) | |
| tree | b0be3d414e5cb2697bf0b7cc12395e8dcde1948e /app/assets/javascripts/extensions | |
| parent | fdb1a15f094d5098c204ccf4e4a81413705e90cf (diff) | |
Merge branch 'update-native-unicode-emojis-with-harmony-modules' into 'master'
Update emojis to use harmony modules (import/export)
See merge request !9784
Diffstat (limited to 'app/assets/javascripts/extensions')
| -rw-r--r-- | app/assets/javascripts/extensions/string.js | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/assets/javascripts/extensions/string.js b/app/assets/javascripts/extensions/string.js index fe23be0bbc1..ae9662444b0 100644 --- a/app/assets/javascripts/extensions/string.js +++ b/app/assets/javascripts/extensions/string.js @@ -1,2 +1,2 @@ -require('string.prototype.codepointat'); -require('string.fromcodepoint'); +import 'string.prototype.codepointat'; +import 'string.fromcodepoint'; |