Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master

2018-06-12 13:17:21 +00:00
parent 34f1fd2a62 6151308c47
commit 4d8d1fa129
58 changed files with 837 additions and 188 deletions
--- a/config/webpack/production.js
+++ b/config/webpack/production.js
@@ -92,7 +92,7 @@ module.exports = merge(sharedConfig, {
      },
      externals: [
        '/emoji/1f602.svg', // used for emoji picker dropdown
-        '/emoji/sheet.png', // used in emoji-mart
+        '/emoji/sheet_10.png', // used in emoji-mart
      ],
      excludes: [
        '**/*.gz',