initial project version
initial project version
initial project version
message
message
 Please enter the commit message for your changes. Lines starting
 with '#' will be ignored, and an empty message aborts the commit.
 On branch master
 Changes to be committed:
   (use "git reset HEAD <file>..." to unstage)

	изменён:   article/views.py

 Untracked files:
   (use "git add <file>..." to include in what will be committed)

	.idea/
 Please enter the commit message for your changes. Lines starting
 with '#' will be ignored, and an empty message aborts the commit.
 On branch master
 Changes to be committed:
   (use "git reset HEAD <file>..." to unstage)

	удалён:    article/__init__.pyc
	удалён:    article/admin.pyc
	удалён:    article/api.pyc
	удалён:    article/forms.pyc
	удалён:    article/models.pyc
	удалён:    article/tests.pyc
	удалён:    article/urls.pyc
	удалён:    article/views.pyc
	удалён:    django_test/__init__.pyc
	удалён:    django_test/forms.pyc
	удалён:    django_test/settings.pyc
	удалён:    django_test/urls.pyc
	удалён:    django_test/views.pyc
	удалён:    django_test/wsgi.pyc
made a change
made a change
made a change
Merge https://github.com/shtakstep/test
ss

Conflicts:
	.gitignore