Self hosted FLOSS fitness/workout, nutrition and weight tracker
Merge branch 'master' into feature/jwt
Roland Geider6bf5ff6bd5f6
diff --cc wger/core/api/views.pyindex 591b97aa5,d77d8044b..e2e696722--- a/wger/core/api/views.py+++ b/wger/core/api/views.py@@@ -56,11 -63,9 +63,8 @@@ from wger.core.models importWeightUnit,)from wger.utils.api_token import create_token- from wger.utils.permissions import (- UpdateOnlyPermission,- WgerPermission,- )+ from wger.utils.permissions import WgerPermission-logger = logging.getLogger(__name__)diff --cc wger/urls.pyindex 73379bd78,8cbd71573..2ce477be2--- a/wger/urls.py+++ b/wger/urls.py@@@ -28,8 -28,8 +28,9 @@@ from django.contrib.sitemaps.views impofrom django.urls import path# Third Party+ from django_email_verification import urls as email_urlsfrom rest_framework import routers+from rest_framework_simplejwt.views import TokenObtainPairView, TokenRefreshView, TokenVerifyView# wgerfrom wger.core.api import views as core_api_views