aboutsummaryrefslogtreecommitdiff
path: root/pdf-as-web-statistic-api
diff options
context:
space:
mode:
authoremusic <emina.music@egiz.gv.at>2018-11-22 13:14:28 +0100
committeremusic <emina.music@egiz.gv.at>2018-11-22 13:14:28 +0100
commitf76f559c8c1437a152a4f51b441e4cebe25430f1 (patch)
tree8930f89863cdc7e564f6a97ac777c133384a8730 /pdf-as-web-statistic-api
parentcd6ff625d48a63e024b05ed1a253be3551e41599 (diff)
parentc87c82009fb07e285d6c9acfd4686efc2cbf21c9 (diff)
downloadpdf-as-4-f76f559c8c1437a152a4f51b441e4cebe25430f1.tar.gz
pdf-as-4-f76f559c8c1437a152a4f51b441e4cebe25430f1.tar.bz2
pdf-as-4-f76f559c8c1437a152a4f51b441e4cebe25430f1.zip
Merge branch 'SL20_development'
# Conflicts: # build.gradle # pdf-as-cli/src/main/java/at/gv/egiz/pdfas/cli/Main.java # pdf-as-lib/src/configuration/cfg/advancedconfig.properties # pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/api/IConfigurationConstants.java # pdf-as-lib/src/main/resources/config/config.zip # pdf-as-web/src/main/java/at/gv/egiz/pdfas/web/config/WebConfiguration.java # pdf-as-web/src/main/java/at/gv/egiz/pdfas/web/servlets/PDFData.java
Diffstat (limited to 'pdf-as-web-statistic-api')
0 files changed, 0 insertions, 0 deletions