first commit to login branch
merge commit
preparing for second merge
working on forms
fixed local settings template
Merge pull request #7 from amulius/login-julian

Login julian
julian backup
backup for testing and depoy
start of testing and depoy
Merge pull request #8 from amulius/testing-deploy

start of testing and depoy
Merge branch 'dev' of github.com:amulius/group-project-base into teacher-backend
preparing for new merge
Merge branch 'dev' of github.com:amulius/group-project-base into login-julian
Merge pull request #9 from amulius/login-julian

Login julian
backup
Merge branch 'dev' of github.com:amulius/group-project-base into teacher-backend
first working version of the teacher backend