Merge branch 'feature/reviews' into develop
# Conflicts: # apps/establishment/admin.py # apps/establishment/models.py # apps/establishment/serializers.py
This commit is contained in:
parent
cd0f03f05d
commit
1494bbbf36
|
|
@ -1,5 +1,6 @@
|
|||
"""Establishment serializers."""
|
||||
from rest_framework import serializers
|
||||
|
||||
from establishment import models
|
||||
from location.serializers import AddressSerializer
|
||||
from main.serializers import MetaDataContentSerializer, AwardSerializer
|
||||
|
|
@ -113,6 +114,6 @@ class EstablishmentSerializer(serializers.ModelSerializer):
|
|||
'awards',
|
||||
'schedule',
|
||||
'phones',
|
||||
'emails'
|
||||
'emails',
|
||||
'reviews',
|
||||
)
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user