Merge branch 'develop' of github.com:status-im/nimbus.status.im into develop

Merge latest changes with header update
This commit is contained in:
Andy Tudhope 2018-10-05 09:37:45 +02:00
commit eb1dce925e
No known key found for this signature in database
GPG Key ID: 02A3DFA93BF26AD2
1 changed files with 2 additions and 2 deletions

2
Jenkinsfile vendored
View File

@ -51,7 +51,7 @@ pipeline {
sshagent(credentials: ['jenkins-ssh']) { sshagent(credentials: ['jenkins-ssh']) {
sh ''' sh '''
scp -o StrictHostKeyChecking=no -r public/. \ scp -o StrictHostKeyChecking=no -r public/. \
jenkins@node-01.do-ams3.proxy.misc.statusim.net:/var/www/dev-docs/ jenkins@node-01.do-ams3.proxy.misc.statusim.net:/var/www/dev-nimbus/
''' '''
} }
} } } }