diff options
author | Harrison Healey <harrisonmhealey@gmail.com> | 2017-06-20 15:22:46 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-06-20 15:22:46 -0400 |
commit | 68ea0abfa665144164041c9421899bfc21412f8a (patch) | |
tree | 5d2f2aa5665a084bd1e544d8342e229a8fafc064 /webapp/package.json | |
parent | 270fc41c0ffe52266f821748db9fd8b4e9d10b36 (diff) | |
download | chat-68ea0abfa665144164041c9421899bfc21412f8a.tar.gz chat-68ea0abfa665144164041c9421899bfc21412f8a.tar.bz2 chat-68ea0abfa665144164041c9421899bfc21412f8a.zip |
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
Diffstat (limited to 'webapp/package.json')
-rw-r--r-- | webapp/package.json | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/webapp/package.json b/webapp/package.json index 729a3c7bf..37a6351f5 100644 --- a/webapp/package.json +++ b/webapp/package.json @@ -15,6 +15,7 @@ "flux": "3.1.2", "font-awesome": "4.7.0", "highlight.js": "9.11.0", + "html-to-react": "1.2.9", "inobounce": "0.1.4", "intl": "1.2.5", "jasny-bootstrap": "3.1.3", |