Merge branch 'devel' of github.com:ansible/ansible-tower into merge-devel

This commit is contained in:
Akita Noek
2016-03-01 15:10:07 -05:00

View File

@@ -2164,7 +2164,7 @@ class NotifierSerializer(BaseSerializer):
"bool": (bool,), "bool": (bool,),
"list": (list,), "list": (list,),
"password": (str, unicode), "password": (str, unicode),
"object": (dict,)} "object": (dict, OrderedDict)}
def to_representation(self, obj): def to_representation(self, obj):
ret = super(NotifierSerializer, self).to_representation(obj) ret = super(NotifierSerializer, self).to_representation(obj)