diff options
| author | Phil Hughes <me@iamphill.com> | 2017-04-21 11:16:05 +0300 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2017-04-21 11:16:05 +0300 |
| commit | dc5136a70d2481f214769a9e28cf82958f3ab124 (patch) | |
| tree | 3dce4997d3a5181365d75697bdaa7ab6be4299cb /config/webpack.config.js | |
| parent | b7b5bd4a49a212f41f08be98997c25c0ce530f97 (diff) | |
| parent | 6fbc6befa1768cc68471d17091ef08b2e73fec82 (diff) | |
Merge remote-tracking branch 'origin/28433-internationalise-cycle-analytics-page' into js-translations
Diffstat (limited to 'config/webpack.config.js')
| -rw-r--r-- | config/webpack.config.js | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/config/webpack.config.js b/config/webpack.config.js index dc9c7786475..10df465faf6 100644 --- a/config/webpack.config.js +++ b/config/webpack.config.js @@ -36,6 +36,7 @@ var config = { issuable: './issuable/issuable_bundle.js', locale: './locale/index.js', issue_show: './issue_show/index.js', + locale: './locale/index.js', main: './main.js', merge_conflicts: './merge_conflicts/merge_conflicts_bundle.js', merge_request_widget: './merge_request_widget/ci_bundle.js', |