mirror of
https://github.com/valitydev/salt.git
synced 2024-11-07 17:09:03 +00:00
d724ed3a47
Conflicts: salt/cli/batch.py salt/cloud/clouds/msazure.py tests/integration/netapi/rest_tornado/test_app.py |
||
---|---|---|
.. | ||
__init__.py | ||
test_app.py |