Merge pull request #1518 from vector-im/kegan/threepids-npe

Fix NPE when loading the Settings page which infini-spinnered

src/components/views/settings/Notifications.js

@@ -74,6 +74,12 @@ module.exports = React.createClass({
         threepids: React.PropTypes.array.isRequired,
     },
 
+    getDefaultProps: function() {
+        return {
+            threepids: []
+        };
+    },
+
     getInitialState: function() {
         return {
             phase: this.phases.LOADING,