Merge branch 'master' into master

2017-04-27 08:39:51 +02:00
parent e43ffa1b43 794766bb18
commit 0adfcb1f5f
3 changed files with 44 additions and 2 deletions
--- a/2
+++ b/2
@@ -5,4 +5,4 @@ RUN apt-get update && \
    apt-get install -y --no-install-recommends graphviz fonts-wqy-zenhei && \
    rm -rf /var/lib/apt/lists/*

-ADD target/plantuml.war /var/lib/jetty/webapps/ROOT.war
+ADD target/plantuml.war /var/lib/jetty/webapps/ROOT.war