Merge branch 'feature/gm-80' into develop

This commit is contained in:
Anatoly 2019-09-19 14:34:47 +03:00
commit 5f42039068
2 changed files with 2 additions and 2 deletions

View File

@ -6,10 +6,9 @@ from rest_framework import generics, permissions
from comment import models as comment_models
from establishment import filters
from establishment import models, serializers
from main.models import MetaDataContent
from establishment.views import EstablishmentMixin
from main.models import MetaDataContent
from timetable.serialziers import ScheduleRUDSerializer, ScheduleCreateSerializer
from timetable.models import Timetable
class EstablishmentListView(EstablishmentMixin, generics.ListAPIView):

View File

@ -1,5 +1,6 @@
from django.db import models
from django.utils.translation import gettext_lazy as _
from utils.models import ProjectBaseMixin