Andrew Smirnov 8b70827f07

Merge branch 'develop' into feature/react_test ...

# Conflicts:
#	main/templates/pages/adm_ruleset.html
#	static/main/js/control.js

2021-05-13 20:02:27 +03:00

..

base

Fix/header

2021-05-10 15:05:34 +00:00

django_registration

Add new page if email has not sent

2021-04-13 20:58:36 +03:00

pages

Merge branch 'develop' into feature/react_test

2021-05-13 20:02:27 +03:00

registration

Add password change page

2021-04-26 21:47:45 +03:00