Merge branch 'develop' into feature/periodic

Browse Source

# Conflicts:
#	access_controller/settings.py
#	access_controller/urls.py
#	main/extra_func.py
#	main/views.py

...

This commit is contained in:

Yuriy Kulakov

2021-03-12 15:37:50 +03:00

parent c1a10b6f2c f6948d016d

commit d300cc2f06

15 changed files with 517 additions and 44 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

BIN

static/main/img/logo_real.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 1.5 KiB