git to-do's #28
Description
- pull updates from laravel_dev branch into the adminpage and UserController branches
- when laravel 5.6 comes out in February, create a new branch off of laravel_dev to update and get rid of any dependency vulnerabilities, then merge back into laravel_dev (actually, there's a new plan: see below)
- pull updates from the laravel_dev branch into the adminpage and UserController branches again
- continue working on the code on the UserController branch. use it for building the authentication system
- finish the code on the tree branch and then delete it. more updates to the TopicTreeController will come later on the adminpage branch, but decide on a request URL and don't change it!
- merge laravel_dev into master and have everyone merge from master (or at least merge the composer.lock file from master)