Merge branch 'openshift'

# Conflicts:
#	docs/docs/developer-guide/index.html
#	docs/docs/developer-guide/tools/index.html
#	docs/docs/getting-started/index.html
#	docs/docs/getting-started/latest/aks/index.html
#	docs/docs/getting-started/latest/configuration/index.html
#	docs/docs/getting-started/latest/configure-backup-and-restore/index.html
#	docs/docs/getting-started/latest/custom-backup-and-restore/index.html
#	docs/docs/getting-started/latest/customization/index.html
#	docs/docs/getting-started/latest/deploy-jenkins/index.html
#	docs/docs/getting-started/latest/diagnostics/index.html
#	docs/docs/getting-started/latest/index.html
#	docs/docs/getting-started/latest/schema/index.html
#	docs/docs/getting-started/v0.1.x/aks/index.html
#	docs/docs/getting-started/v0.1.x/configuration/index.html
#	docs/docs/getting-started/v0.1.x/configure-backup-and-restore/index.html
#	docs/docs/getting-started/v0.1.x/customization/index.html
#	docs/docs/getting-started/v0.1.x/deploy-jenkins/index.html
#	docs/docs/getting-started/v0.1.x/diagnostics/index.html
#	docs/docs/getting-started/v0.1.x/index.html
#	docs/docs/getting-started/v0.1.x/migration-guide-v1alpha1-to-v1alpha2/index.html
#	docs/docs/getting-started/v0.1.x/scheme/index.html
#	docs/docs/getting-started/v0.2.x/migration/index.html
#	docs/docs/how-it-works/architecture-and-design/index.html
#	docs/docs/how-it-works/index.html
#	docs/docs/how-it-works/jenkins-docker-images/index.html
#	docs/docs/index.html
#	docs/docs/index.xml
#	docs/docs/installation/index.html
#	docs/docs/security/index.html
#	docs/sitemap.xml
This commit is contained in:
Tomasz Sęk
2019-12-25 12:08:12 +01:00
18 changed files with 243 additions and 152 deletions
+1 -1
View File
@@ -3139,6 +3139,6 @@ on git commit <code>b6e1057</code>.
</description>
</item>
</channel>
</rss>