Fabio/nginx-proxy-manager
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

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

Browse source
This commit is contained in:
Jamie Curnow 2019-03-01 13:48:30 +10:00
commit ae9324295c
1 changed files with 4 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Jenkinsfile vendored
View file

@ -82,7 +82,11 @@ pipeline {
} }
stage('Build Master') { stage('Build Master') {
when { when {
<<<<<<< HEAD
branch 'master' branch 'master'
=======
branch: 'master'
>>>>>>> 0acec1105bb2c29e1e03a81cfb05a6426b3e2a20
} }
parallel { parallel {
stage('x86_64') { stage('x86_64') {