Merge branch 't5_form'
Merge branch 't5_form'
ticket:1 fixed css, test, Makefile. Change django version
Signed-off-by: Mykola Yaremov <n.yaremov@gmail.com>
ticket:3 create test
Signed-off-by: Mykola Yaremov <n.yaremov@gmail.com>
ticket:3 create model, view, template and fixed test
Signed-off-by: Mykola Yaremov <n.yaremov@gmail.com>
ticket:3 create model, view, template and fixed test
Signed-off-by: Mykola Yaremov <n.yaremov@gmail.com>
ticket:3 fixed some errors with path and rebase for master
Signed-off-by: Mykola Yaremov <n.yaremov@gmail.com>
ticket:3 fixed view and test, how in notes
Signed-off-by: Mykola Yaremov <n.yaremov@gmail.com>
Merge branch 't3_middleware' of https://github.com/myar/django-hello-world into t3_middleware

Conflicts:
	django_hello_world/myapp/tests.py
	django_hello_world/myapp/views.py
	django_hello_world/settings.py
	django_hello_world/templates/base.html

Signed-off-by: Mykola Yaremov <n.yaremov@gmail.com>
ticket:1 fixed css, test, Makefile. Change django version
Signed-off-by: Mykola Yaremov <n.yaremov@gmail.com>
ticket:1 fixed static url in base.html and fixed css
Signed-off-by: Mykola Yaremov <n.yaremov@gmail.com>
Merge branch 't1_contact'
ticket:1 fixed css, test, Makefile. Change django version
Signed-off-by: Mykola Yaremov <n.yaremov@gmail.com>
ticket:3 create test
Signed-off-by: Mykola Yaremov <n.yaremov@gmail.com>
ticket:3 create model, view, template and fixed test
Signed-off-by: Mykola Yaremov <n.yaremov@gmail.com>
ticket:3 create model, view, template and fixed test
Signed-off-by: Mykola Yaremov <n.yaremov@gmail.com>
ticket:3 fixed some errors with path and rebase for master
Signed-off-by: Mykola Yaremov <n.yaremov@gmail.com>
ticket:3 fixed view and test, how in notes
Signed-off-by: Mykola Yaremov <n.yaremov@gmail.com>
ticket:3 fixed error after rebase
Signed-off-by: Mykola Yaremov <n.yaremov@gmail.com>
Merge branch 't3_middleware' of https://github.com/myar/django-hello-world into t3_middleware

Conflicts:
	django_hello_world/myapp/static/css/main.css
	django_hello_world/myapp/tests.py

Signed-off-by: Mykola Yaremov <n.yaremov@gmail.com>