saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
salt/doc/_themes/saltstack2
History
Erik Johnson f13ddeb394 Merge remote-tracking branch 'upstream/2016.11' into merge-2017.7 
Conflicts:
- doc/_themes/saltstack2/layout.html
- salt/auth/__init__.py
- salt/utils/schedule.py
2017-06-28 20:27:32 -05:00
..
static Merge remote-tracking branch 'upstream/2016.11' into merge-2017.7 2017-06-28 20:27:32 -05:00
layout.html Merge remote-tracking branch 'upstream/2016.11' into merge-2017.7 2017-06-28 20:27:32 -05:00
theme.conf