Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/release_17.09' into dev
Browse files Browse the repository at this point in the history
  • Loading branch information
dannon committed Oct 3, 2017
2 parents 9481b85 + 0827b23 commit 251551c
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions lib/galaxy/model/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -87,8 +87,8 @@ def set_datatypes_registry(d_registry):


class HasTags(object):
dict_collection_visible_keys = ('tags')
dict_element_visible_keys = ('tags')
dict_collection_visible_keys = ('tags',)
dict_element_visible_keys = ('tags',)

def to_dict(self, *args, **kwargs):
rval = super(HasTags, self).to_dict(*args, **kwargs)
Expand Down

0 comments on commit 251551c

Please sign in to comment.