rallytime 2c052e34b3 Merge branch '2017.7' into 'develop' ... Conflicts: - .gitignore - salt/modules/win_lgpo.py - salt/utils/__init__.py - tests/integration/spm/test_build.py - tests/unit/test_pydsl.py		2017-11-05 20:28:51 -07:00
..
index.rst	digitalocean should be one word.	2017-09-19 12:47:16 -06:00
integration.rst	digitalocean should be one word.	2017-09-19 12:47:16 -06:00
unit.rst	Fix documentation grammar and spelling errors	2017-10-25 17:24:26 -06:00