Merge branch 'develop' of github.com:jc21/nginx-proxy-manager into develop

This commit is contained in:
Jamie Curnow committed 2019-03-01 13:48:30 +10:00
commit ae9324295c
1 file changed
+4
Vendored
+4
View File
@@ -82,7 +82,11 @@ pipeline {
}
stage('Build Master') {
when {
<<<<<<< HEAD
branch 'master'
=======
branch: 'master'
>>>>>>> 0acec1105bb2c29e1e03a81cfb05a6426b3e2a20
}
parallel {
stage('x86_64') {