about summary refs log tree commit diff
path: root/package.json
diff options
context:
space:
mode:
authorbeatrix <beatrix.bitrot@gmail.com>2017-09-28 21:48:28 -0400
committerGitHub <noreply@github.com>2017-09-28 21:48:28 -0400
commitc027a7bd4d7b5af21f4b201d656f7251fa3606a1 (patch)
treece2c2327b26358c26cb899ea918988af373ca6d6 /package.json
parent210e6776fce016666ecfd248b2208c487f3440f9 (diff)
parent53f829dfa8bc376041a442dc84c22aa1cbfcb9d0 (diff)
Merge pull request #157 from glitch-soc/merging-upstream
ABRACA-HRRRRRRRRRRRNGGGGGGGHHH!!!!!!!!!!!!!!!!!!!
Diffstat (limited to 'package.json')
-rw-r--r--package.json3
1 files changed, 3 insertions, 0 deletions
diff --git a/package.json b/package.json
index 228dd1f25..7835a0440 100644
--- a/package.json
+++ b/package.json
@@ -45,6 +45,7 @@
     "css-loader": "^0.28.4",
     "detect-passive-events": "^1.0.2",
     "dotenv": "^4.0.0",
+    "emoji-mart": "^1.0.1",
     "emojione": "^2.2.7",
     "emojione-picker": "^2.2.1",
     "es6-symbol": "^3.1.1",
@@ -88,11 +89,13 @@
     "react-intl": "^2.4.0",
     "react-motion": "^0.5.0",
     "react-notification": "^6.7.1",
+    "react-overlays": "^0.8.1",
     "react-redux": "^5.0.4",
     "react-redux-loading-bar": "^2.9.2",
     "react-router-dom": "^4.1.1",
     "react-router-scroll": "ytase/react-router-scroll#build",
     "react-simple-dropdown": "^3.0.0",
+    "react-sizeme": "^2.3.5",
     "react-swipeable-views": "^0.12.3",
     "react-textarea-autosize": "^5.0.7",
     "react-toggle": "^4.0.1",