Commit c58d41e5 authored by Agate's avatar Agate 💬

Merge branch 'rest-framework-3.10' into 'develop'

Updated Django Rest Framework to v3.10

See merge request !847
parents bb1a895a 4d5e4746
import base64
from collections.abc import Mapping
import datetime
import logging
import pendulum
......@@ -9,7 +10,6 @@ import mutagen.oggvorbis
import mutagen.flac
from rest_framework import serializers
from rest_framework.compat import Mapping
from funkwhale_api.tags import models as tags_models
......
......@@ -29,7 +29,7 @@ celery>=4.3,<4.4
# Your custom requirements go here
django-cors-headers>=2.5.3,<2.6
musicbrainzngs==0.6
djangorestframework>=3.9,<3.10
djangorestframework>=3.10,<3.11
djangorestframework-jwt>=1.11,<1.12
pendulum>=2,<3
persisting-theory>=0.2,<0.3
......@@ -41,7 +41,7 @@ mutagen>=1.42,<1.43
pymemoize==1.0.3
django-dynamic-preferences>=1.7,<1.8
django-dynamic-preferences>=1.7.1,<1.8
raven>=6.10,<7
python-magic==0.4.15
# XXX: until https://github.com/django/channels/issues/1240 is fixed
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment