Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[2016.11] Merge forward from 2016.3 to 2016.11 #42370

Merged
merged 3 commits into from Jul 18, 2017

Conversation

rallytime
Copy link
Contributor

Conflicts:

  • doc/conf.py

@rallytime rallytime merged commit 016189f into saltstack:2016.11 Jul 18, 2017
@rallytime rallytime deleted the merge-2016.11 branch July 18, 2017 22:39
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants