diff options
| author | mh <mh@immerda.ch> | 2014-04-19 18:21:40 +0200 |
|---|---|---|
| committer | mh <mh@immerda.ch> | 2014-04-19 18:23:03 +0200 |
| commit | 2adb39b5c7905b22955f375dfebdcd0cb20d69ff (patch) | |
| tree | 67d49cd379bf38d244c07ab0a675a342238da76f /README | |
| parent | e14622cd4495a9c0ccae391f6168dec21dba0985 (diff) | |
| parent | 2f2aa65dafc57db6ab6d60db7ea18059840ad927 (diff) | |
Merge remote-tracking branch 'lavamind/master'
Conflicts:
manifests/config/file.pp
manifests/vhost/php/standard.pp
Diffstat (limited to 'README')
| -rw-r--r-- | README | 1 |
1 files changed, 0 insertions, 1 deletions
@@ -166,7 +166,6 @@ apache::vhost { "$domain": vhost_source => 'modules/site_configs/vhosts.d/${name}.conf" } - There are multiple other additional configurables that you can pass to each vhost definition: |