rallytime 186f57eede Merge branch '2017.7' into '2018.3' ... Conflicts: - salt/modules/network.py		2018-09-13 17:11:18 -04:00
..
__init__.py	Add new module type for serializers from issue #22257.	2015-05-28 20:03:11 -04:00
test_serializers.py	Merge branch '2017.7' into '2018.3'	2018-09-13 17:11:18 -04:00