]> gitweb.fluxo.info Git - puppet-stdlib.git/commitdiff
projects / puppet-stdlib.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 8709241 fb8993b)
Merge branch '3.x'
authorJeff McCune <jeff@puppetlabs.com>
Thu, 30 Aug 2012 21:57:55 +0000 (14:57 -0700)
committerJeff McCune <jeff@puppetlabs.com>
Thu, 30 Aug 2012 21:57:55 +0000 (14:57 -0700)
* 3.x:
  (Maint) Remove core function documentation from README

Conflicts:
README.markdown

1  2 
README.markdown patch | diff1 | diff2 | blob | history

diff --cc README.markdown
Simple merge
Puppet module for stdlib