Merge branch 'master' of github.com:coralproject/talk into install-admin

client/coral-sign-in/components/SignInContent.js

@@ -97,7 +97,7 @@ const SignInContent = ({
 SignInContent.propTypes = {
   auth: PropTypes.shape({
     isLoading: PropTypes.bool.isRequired,
-    error: PropTypes.object,
+    error: PropTypes.string,
     emailVerificationFailure: PropTypes.bool
   }).isRequired,
   fetchSignInFacebook: PropTypes.func.isRequired,