Merge branch 'master' into file_org

2026-03-11 05:35:05 +00:00 · 2019-10-01 19:00:19 -04:00
parent 89e8942624 fadb0f0399
commit 2e157b9088
11 changed files with 433 additions and 240 deletions
--- a/twistter-frontend/src/components/layout/NavBar.js
+++ b/twistter-frontend/src/components/layout/NavBar.js
@@ -19,7 +19,9 @@ export class Navbar extends Component {
                    <Button component={ Link } to='/register'>
                        Register
                    </Button>
-                    
+		    <Button component={ Link } to='/logout'>
+			Logout
+		    </Button>
                </ToolBar>
            </AppBar>
        )