valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 08:58:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
3e319d50b3
salt/doc/topics/jinja
History
rallytime 3e319d50b3
Merge branch '2017.7' into 'oxygen' 
Conflicts:
  - README.rst
  - salt/modules/win_pkg.py
  - salt/utils/process.py
2017-12-14 13:01:29 -05:00
..
index.rst Merge branch '2017.7' into 'oxygen' 2017-12-14 13:01:29 -05:00