Merge branch 'master' into profile_display

This commit is contained in:
Leon Liang
2019-10-02 23:24:21 -04:00
15 changed files with 509 additions and 365 deletions

View File

@@ -12,7 +12,7 @@ import Navbar from './components/layout/NavBar';
import home from './pages/Home';
import register from './pages/Register';
import login from './pages/Login';
import user from './pages/User';
import user from './pages/user';
import writeMicroblog from './Writing_Microblogs.js';
import edit from './pages/edit.js';
@@ -40,4 +40,4 @@ class App extends Component {
}
}
export default App;
export default App;