Auto stash before merge of "master" and "devel"

2018-02-28 20:45:16 +01:00 · 2018-02-28 20:45:16 +01:00 · c5bfbc387f
commit c5bfbc387f
parent ae6fa14afe
2 changed files with 3 additions and 0 deletions
--- 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
--- a/1
+++ b/1
@ -20,5 +20,6 @@ node {
    }
    stage('Cleaning'){
        sh "docker image prune -f"
+        build job: 'Bot Discord javadoc', wait: false
    }
 }