diff options
| author | Jeff McCune <jeff@puppetlabs.com> | 2012-08-30 14:57:55 -0700 |
|---|---|---|
| committer | Jeff McCune <jeff@puppetlabs.com> | 2012-08-30 14:57:55 -0700 |
| commit | 6961179007dce76d7fb9bd1fc361273acb4129a7 (patch) | |
| tree | ea5d72ca91e936cd4c2d51074030f8e6029a1c4e /lib | |
| parent | 87092415fb190ad439e7ab2a0429aef23ff7dff5 (diff) | |
| parent | fb8993bf48ba6e6baeb1f2b1987262a287285965 (diff) | |
Merge branch '3.x'
* 3.x:
(Maint) Remove core function documentation from README
Conflicts:
README.markdown
Diffstat (limited to 'lib')
0 files changed, 0 insertions, 0 deletions