salt/doc/_themes
rallytime fa5e17b342 Merge branch '2015.8' into '2016.3'
Conflicts:
  - salt/modules/win_service.py
  - salt/modules/zypper.py
  - salt/states/pkgrepo.py
2016-03-30 15:33:13 -06:00
..
saltstack Remove trailing white spaces in documentation files 2016-03-01 17:36:23 +02:00
saltstack2 Merge branch '2015.8' into '2016.3' 2016-03-30 15:33:13 -06:00