Merge branch 'master' into glitch-soc/merge-upstream

2018-11-06 15:22:44 +01:00
parent 34209c0340 7775225d17
commit 36dab188fd
83 changed files with 1045 additions and 89 deletions
--- a/package.json
+++ b/package.json
@@ -106,6 +106,7 @@
    "react-redux-loading-bar": "^2.9.3",
    "react-router-dom": "^4.1.1",
    "react-router-scroll-4": "^1.0.0-beta.1",
+    "react-select": "^2.0.0",
    "react-sparklines": "^1.7.0",
    "react-swipeable-views": "^0.12.17",
    "react-textarea-autosize": "^5.2.1",