Sokurov Idar 9e49a12524 Merge branch 'develop' into feature/statistic/main ...

# Conflicts:
#	main/models.py
#	main/views.py

2021-03-29 21:45:07 +03:00

..

base

Added notificcations about role changes

2021-03-21 19:47:42 +03:00

django_registration

12-hour working day

2021-03-11 19:17:11 +03:00

pages

Merge branch 'develop' into feature/statistic/main

2021-03-29 21:45:07 +03:00

registration

Added fixture with base users

2021-03-14 17:54:55 +03:00