From c5bfbc387fd32b3cb0b63df11a179f5717101fde Mon Sep 17 00:00:00 2001 From: Sebastien Date: Wed, 28 Feb 2018 20:45:16 +0100 Subject: [PATCH] Auto stash before merge of "master" and "devel" --- .gitignore | 2 ++ Jenkinsfile | 1 + 2 files changed, 3 insertions(+) diff --git a/.gitignore b/.gitignore index b66cef7..6b41cc8 100644 --- a/.gitignore +++ b/.gitignore @@ -18,3 +18,5 @@ classes/artifacts/Discord_Stroumpf_Beta_jar/ src/main/resources/templates/css src/main/resources/templates/js + +\.directory diff --git a/Jenkinsfile b/Jenkinsfile index 012b398..4c94390 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -20,5 +20,6 @@ node { } stage('Cleaning'){ sh "docker image prune -f" + build job: 'Bot Discord javadoc', wait: false } }