(regenv) alexander@ubuntu-clear:~/new_version/registration_center$ git merge --no-ff alex_new_version
Auto-merging elena/Doctor_at_home/rest_api/rest_views.py
Merge made by the 'recursive' strategy.
 elena/Doctor_at_home/Doctor_at_home_help/settings.py                        |   18 +-
 elena/Doctor_at_home/Doctor_at_home_team/settings.py                        |   17 +
 elena/Doctor_at_home/account/migrations/0071_auto_20210519_0559.py          |   49 +++
 elena/Doctor_at_home/account/migrations/0072_auto_20210519_0603.py          |   19 ++
 elena/Doctor_at_home/account/migrations/0073_auto_20210519_0604.py          |   19 ++
 elena/Doctor_at_home/medicalaccount/migrations/0008_auto_20210519_0607.py   |   45 +++
 elena/Doctor_at_home/medicalaccount/migrations/0009_auto_20210519_0806.py   |   37 +++
 elena/Doctor_at_home/medicalaccount/models.py                               |    2 +-
 elena/Doctor_at_home/medicalaccount/templatetags/0008_auto_20210519_0559.py |   50 +++
 elena/Doctor_at_home/medicalaccount/templatetags/0009_auto_20210519_0603.py |   18 ++
 elena/Doctor_at_home/registration/migrations/0132_auto_20210519_0559.py     |   18 ++
 elena/Doctor_at_home/registration/tasks.py                                  | 1168 ++++++++++++++++++++++++++++++++++++++++++++++-----------------------
 elena/Doctor_at_home/rest_api/rest_views.py                                 |   21 +-
 elena/Doctor_at_home/rest_api/updaterequest.py                              |    2 +-
 14 files changed, 1072 insertions(+), 411 deletions(-)
 create mode 100644 elena/Doctor_at_home/account/migrations/0071_auto_20210519_0559.py
 create mode 100644 elena/Doctor_at_home/account/migrations/0072_auto_20210519_0603.py
 create mode 100644 elena/Doctor_at_home/account/migrations/0073_auto_20210519_0604.py
 create mode 100644 elena/Doctor_at_home/medicalaccount/migrations/0008_auto_20210519_0607.py
 create mode 100644 elena/Doctor_at_home/medicalaccount/migrations/0009_auto_20210519_0806.py
 create mode 100644 elena/Doctor_at_home/medicalaccount/templatetags/0008_auto_20210519_0559.py
 create mode 100644 elena/Doctor_at_home/medicalaccount/templatetags/0009_auto_20210519_0603.py
 create mode 100644 elena/Doctor_at_home/registration/migrations/0132_auto_20210519_0559.py
(regenv) alexander@ubuntu-clear:~/new_version/registration_center$ git merge --no-ff alex_new_version
Already up to date.