diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2019-06-19 16:19:32 +0200 |
|---|---|---|
| committer | Thibaut Girka <thib@sitedethib.com> | 2019-06-19 18:36:16 +0200 |
| commit | 356e9150dfec5bbb8a56b128c1d3372cd5731ec6 (patch) | |
| tree | b5270b3fe3c38ef2d94670f06613c4bdf71d0631 /babel.config.js | |
| parent | f4b008906dcfc3333ec533884aa10b65f8ae41a2 (diff) | |
| parent | ede0be5dba6836606db772a007ad9be5d60c7b99 (diff) | |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: - app/lib/sanitize_config.rb Keep our version, we support the tags upstream transforms. - package.json - yarn.lock
Diffstat (limited to 'babel.config.js')
| -rw-r--r-- | babel.config.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/babel.config.js b/babel.config.js index 55efafc40..a506ad8ce 100644 --- a/babel.config.js +++ b/babel.config.js @@ -17,7 +17,7 @@ module.exports = (api) => { ['@babel/proposal-object-rest-spread', { useBuiltIns: true }], ['@babel/proposal-decorators', { legacy: true }], '@babel/proposal-class-properties', - ['react-intl', { messagesDir: './build/messages/' }], + ['react-intl', { messagesDir: './build/messages' }], 'preval', ], }; |