summaryrefslogtreecommitdiff
path: root/.gitignore
diff options
context:
space:
mode:
authorJeff McCune <jeff@puppetlabs.com>2012-10-25 12:01:46 -0700
committerJeff McCune <jeff@puppetlabs.com>2012-10-25 12:01:46 -0700
commitefb0a85b41b390e14aece19e4473d1171fe64126 (patch)
tree2842ce745414ff935c72d36a6b24b561e075cbd5 /.gitignore
parentf2143e081619a40d000aa100c32e2b55d366ee37 (diff)
parent81b1f1b37665cc6e3afb0ba94b4367bd542a3ccb (diff)
Merge branch '4.x'
* 4.x:
Diffstat (limited to '.gitignore')
0 files changed, 0 insertions, 0 deletions