Merge remote-tracking branch 'origin/develop' into read_receipts

2015-11-16 16:33:39 +00:00
parent d6b86598e5 bf91155e60
commit bb59e9276b
32 changed files with 250 additions and 147 deletions
@@ -37,9 +37,8 @@
    "react-dnd-html5-backend": "^2.0.0",
    "react-dom": "^0.14.2",
    "react-gemini-scrollbar": "^2.0.1",
-    "react-loader": "^1.4.0",
-    "sanitize-html": "^1.0.0",
    "velocity-animate": "^1.2.3"
+    "sanitize-html": "^1.0.0"
  },
  "devDependencies": {
    "babel": "^5.8.23",