Merge branch 'develop' into skindex-nextgen

2015-12-01 15:48:05 +00:00
parent 7f27ffd7bd d5819d54db
commit 5e2a4fa537
29 changed files with 3168 additions and 989 deletions
--- a/package.json
+++ b/package.json
@@ -32,6 +32,7 @@
    "q": "^1.4.1",
    "react": "^0.14.2",
    "react-dom": "^0.14.2",
+    "react-gemini-scrollbar": "^2.0.1",
    "sanitize-html": "^1.11.1",
    "velocity-animate": "^1.2.3"
  },