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

No conflicts.
2019-01-19 18:28:37 +01:00
parent 530d29148c 7c3fddeab4
commit 5e0cf92fd1
57 changed files with 1103 additions and 444 deletions
--- a/package.json
+++ b/package.json
@ -100,6 +100,7 @@
    "react-immutable-proptypes": "^2.1.0",
    "react-immutable-pure-component": "^1.1.1",
    "react-intl": "^2.7.2",
+    "react-masonry-infinite": "^1.2.2",
    "react-motion": "^0.5.2",
    "react-notification": "^6.8.4",
    "react-overlays": "^0.8.3",