Merge branch 'develop' into feature/documentation

# Conflicts:
#	main/apiauth.py
#	main/tests.py
#	requirements/common.txt
#	requirements/dev.txt
This commit is contained in:
Степаненко Ольга
2021-05-23 11:51:41 +03:00
15 changed files with 289 additions and 278 deletions

View File

@@ -33,14 +33,6 @@ Serializers
:members:
***************
API functions
***************
.. automodule:: main.apiauth
:members:
*****
Views
*****