yetangitu/funkwhale
1
0
Fork 0
mirror of https://code.eliotberriot.com/funkwhale/funkwhale.git synced 2025-10-06 03:09:55 +02:00
Code Issues Releases Wiki Activity

Merge branch 'master' into develop

Browse source
This commit is contained in:
Eliot Berriot 2019-07-05 16:04:39 +02:00
commit b95710bb3a
No known key found for this signature in database
GPG key ID: DD6965E2476E5C27
12 changed files with 99 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

2
api/tests/conftest.py
View file

@ -29,8 +29,8 @@ from rest_framework.test import APIClient, APIRequestFactory
from funkwhale_api.activity import record
from funkwhale_api.federation import actors
from funkwhale_api.music import licenses
from funkwhale_api.moderation import mrf
from funkwhale_api.music import licenses
pytest_plugins = "aiohttp.pytest_plugin"