Merge branch 'develop' into add-emoji-selector

aszecsei · Apr 25, 2018 · ea1573d · ea1573d
2 parents 843391e + 1e72000
commit ea1573d
Show file tree

Hide file tree

Showing 2 changed files with 257 additions and 15 deletions.
diff --git a/package.json b/package.json
@@ -74,7 +74,7 @@
     "nyc": "^11.4.1",
     "prettier": "^1.10.2",
     "redux-mock-store": "^1.5.1",
-    "rewire": "^3.0.2",
+    "rewire": "^4.0.1",
     "sass-loader": "^6.0.6",
     "sinon": "^5.0.0",
     "sinon-chai": "^3.0.0",