centersl/ansible-docs
1
0
Fork 0
mirror of https://github.com/ansible/ansible-documentation.git synced 2026-03-26 13:18:58 +07:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote branch 'stijnopheide/jinja-relative' into devel

Browse Source 
Conflicts:
	.gitignore
This commit is contained in:
Michael DeHaan
2012-10-10 20:24:12 -04:00
parent 062484b9bd 4a6b5c5de2
commit 7e542d78a7
2 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
.gitignore vendored
View File

@@ -16,3 +16,6 @@ rpm-build
.DS_Store
# manpage build results (not all checked in)
docs/man/man3/*
# Sublime stuff
*.sublime-project
*.sublime-workspace