Merge branch 'develop' into feature/pylint
# Conflicts: # main/apiauth.py # main/tests.py # requirements/common.txt # requirements/dev.txt
This commit is contained in:
@@ -33,14 +33,6 @@ Serializers
|
||||
:members:
|
||||
|
||||
|
||||
***************
|
||||
API functions
|
||||
***************
|
||||
|
||||
.. automodule:: main.apiauth
|
||||
:members:
|
||||
|
||||
|
||||
*****
|
||||
Views
|
||||
*****
|
||||
|
||||
Reference in New Issue
Block a user