diff options
| author | Micah <micah@riseup.net> | 2015-10-09 18:53:44 +0000 |
|---|---|---|
| committer | Micah <micah@riseup.net> | 2015-10-09 18:53:44 +0000 |
| commit | f215de3de43f141ae71fd124a84003d157da7295 (patch) | |
| tree | 21d96e22aae423c8c6f8f02cea06647bb1de94bc /manifests/base.pp | |
| parent | 71f8db0adc48de70af89892441569af97d646010 (diff) | |
| parent | 7cb5f0625c929ccbc6029b6bb12f97f7f2bfe70a (diff) | |
Merge branch 'UpdateApacheConf' into 'master'
update the apache2.conf file
updating to the debian 3.5.1.dfsg-2+b1 version of the file. mostly
whitespace changes, one 2.2 vs 2.4 change and a change for docs.
See merge request !14
Diffstat (limited to 'manifests/base.pp')
0 files changed, 0 insertions, 0 deletions