Merge branch 'master' of honey.fitz.guru:eventment-app

# Conflicts: # app/components/Login/LocalLogin.js # app/screens/Register.js
2019-08-07 10:23:40 -04:00
parent b8ea813a77 847c9b192a
commit aea9bbda96
102 changed files with 2111 additions and 2054 deletions
--- a/app/components/Login/LocalLogin.js
+++ b/app/components/Login/LocalLogin.js
@@ -54,5 +54,5 @@ export default function LocalLogin({ doLoginAction }) {
 }

 LocalLogin.propTypes = {
-  doLoginAction: PropTypes.func.isRequired,
+    doLoginAction: PropTypes.func.isRequired,
 };