Merge branch 'feature/reviews' into develop

# Conflicts:
#	apps/establishment/admin.py
#	apps/establishment/models.py
#	apps/establishment/serializers.py
This commit is contained in:
Anatoly 2019-09-01 14:09:37 +03:00
parent cd0f03f05d
commit 1494bbbf36

View File

@ -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',
)