From 68ea0abfa665144164041c9421899bfc21412f8a Mon Sep 17 00:00:00 2001
From: Harrison Healey <harrisonmhealey@gmail.com>
Date: Tue, 20 Jun 2017 15:22:46 -0400
Subject: PLT-4457 Added AtMention component to better render at mentions
 (#6563)

* Moved Utils.searchForTerm into an action

* Added easier importing of index.jsx files

* PLT-4457 Added AtMention component to better render at mentions

* Fixed client unit tests

* Fixed merge conflict

* Fixed merge conflicts
---
 webapp/webpack.config.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'webapp/webpack.config.js')

diff --git a/webapp/webpack.config.js b/webapp/webpack.config.js
index 6bc2834e0..16540d22d 100644
--- a/webapp/webpack.config.js
+++ b/webapp/webpack.config.js
@@ -241,7 +241,8 @@ var config = {
         alias: {
             jquery: 'jquery/dist/jquery',
             superagent: 'node_modules/superagent/lib/client'
-        }
+        },
+        extensions: ['.js', '.jsx']
     },
     performance: {
         hints: 'warning'
-- 
cgit v1.2.3-1-g7c22