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

..

adm_ruleset.html

Added notificcations about role changes

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

index.html

Added base html

2021-02-07 15:02:08 +03:00

profile.html

Profile view page refactoring

2021-03-04 20:01:10 +03:00

statistic.html

marge statistic/backend and statistic/frontend

2021-03-29 21:40:13 +03:00

work.html

Added notificcations about role changes

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