Yuriy Kulakov 0a85ddacd2 Merge branch 'develop' into feature/react_test ...

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

2021-05-27 19:35:59 +03:00

..

main

Merge branch 'develop' into feature/react_test

2021-05-27 19:35:59 +03:00

modules/notifications

Fix .gitignore, add required files

2021-04-26 21:54:15 +03:00

.gitkeep

Initial commit. Add django.

2021-02-04 20:01:35 +03:00

no_avatar.png

Fix non-existing profile avatar

2021-02-11 19:44:35 +03:00