Merge branch 'jenkins-build-16' into 'master'
Auto-merge for build 16 See merge request puppet/haproxy_cd!3
This commit is contained in:
@@ -108,6 +108,7 @@ All files and directories are configured with correct selinux context. If selinu
|
||||
## Contact Us
|
||||
|
||||
[contact Us](https://confdroid.com/contact/)
|
||||
[Feedback Portal](https://feedback.confdroid.com/)
|
||||
|
||||
## Disclaimer
|
||||
|
||||
|
||||
@@ -188,7 +188,7 @@
|
||||
|
||||
<h2 id="label-Contact+Us">Contact Us</h2>
|
||||
|
||||
<p><a href="https://confdroid.com/contact/">contact Us</a></p>
|
||||
<p><a href="https://confdroid.com/contact/">contact Us</a> <a href="https://feedback.confdroid.com/">Feedback Portal</a></p>
|
||||
|
||||
<h2 id="label-Disclaimer">Disclaimer</h2>
|
||||
|
||||
|
||||
@@ -188,7 +188,7 @@
|
||||
|
||||
<h2 id="label-Contact+Us">Contact Us</h2>
|
||||
|
||||
<p><a href="https://confdroid.com/contact/">contact Us</a></p>
|
||||
<p><a href="https://confdroid.com/contact/">contact Us</a> <a href="https://feedback.confdroid.com/">Feedback Portal</a></p>
|
||||
|
||||
<h2 id="label-Disclaimer">Disclaimer</h2>
|
||||
|
||||
|
||||
Reference in New Issue
Block a user