From 1494bbbf36d7f449c1ca297a54161aec8088fb5d Mon Sep 17 00:00:00 2001 From: Anatoly Date: Sun, 1 Sep 2019 14:09:37 +0300 Subject: [PATCH] Merge branch 'feature/reviews' into develop # Conflicts: # apps/establishment/admin.py # apps/establishment/models.py # apps/establishment/serializers.py --- apps/establishment/serializers.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/apps/establishment/serializers.py b/apps/establishment/serializers.py index ea4af485..4cd5e348 100644 --- a/apps/establishment/serializers.py +++ b/apps/establishment/serializers.py @@ -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', )