Merge conflicts

This commit is contained in:
Fergal Moran
2015-08-20 21:12:18 +01:00
99 changed files with 674 additions and 20492 deletions

View File

@@ -491,6 +491,7 @@ class MessageSerializer(serializers.ModelSerializer):
'body',
)
class ShowSerializer(serializers.ModelSerializer):
class Meta:
model = Show
model = Show