Merge branch 't1_contact'
ticket:1 fixed Mikefile
Signed-off-by: Mykola Yaremov <n.yaremov@gmail.com>
Merge branch 't1_contact'
ticket:1 added all my app in requirements
Signed-off-by: Mykola Yaremov <n.yaremov@gmail.com>
ticket:1 added run command to makefile
Signed-off-by: Mykola Yaremov <n.yaremov@gmail.com>
ticket:1 new Makefile and requirements files
Signed-off-by: Mykola Yaremov <n.yaremov@gmail.com>
ticket:1 fixed path for app in project
Signed-off-by: Mykola Yaremov <n.yaremov@gmail.com>
ticket:1 added all my app in requirements
Signed-off-by: Mykola Yaremov <n.yaremov@gmail.com>
ticket:1 added run command to makefile
Signed-off-by: Mykola Yaremov <n.yaremov@gmail.com>
ticket:1 new Makefile and requirements files
Signed-off-by: Mykola Yaremov <n.yaremov@gmail.com>
ticket:1 fixed path for app in project
Signed-off-by: Mykola Yaremov <n.yaremov@gmail.com>
Merge branch 't1_contact'
ticket:1 added tatic for url end settings
Signed-off-by: Mykola Yaremov <n.yaremov@gmail.com>
Merge branch 't1_contact' of https://github.com/myar/django-hello-world into t1_contact

Conflicts:
	django_hello_world/urls.py

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 fixed some errors with path and rebase for master
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/middleware.py
	django_hello_world/myapp/admin.py
	django_hello_world/myapp/tests.py
	django_hello_world/myapp/urls.py
	django_hello_world/myapp/views.py
	django_hello_world/settings.py
	django_hello_world/urls.py

Signed-off-by: Mykola Yaremov <n.yaremov@gmail.com>
Merge branch 't3_middleware'
ticket:4 create test
Signed-off-by: Mykola Yaremov <n.yaremov@gmail.com>