diff options
| author | Alexander Marsalek <amarsalek@iaik.tugraz.at> | 2021-06-01 12:13:12 +0200 |
|---|---|---|
| committer | Alexander Marsalek <amarsalek@iaik.tugraz.at> | 2021-06-01 14:38:17 +0200 |
| commit | 4566ef134c84c31b294ade015bc7e62b9c47ae79 (patch) | |
| tree | a838565a81a6f13e5a34739d1ed96eadd89faba9 /cpycommands.txt | |
| parent | 90d2ec69b01a5622c462cde538e0c739322a81ba (diff) | |
| parent | 1263be201c27b6e96cc9975a6dddd5a9f1306c77 (diff) | |
| download | pdf-as-4-4566ef134c84c31b294ade015bc7e62b9c47ae79.tar.gz pdf-as-4-4566ef134c84c31b294ade015bc7e62b9c47ae79.tar.bz2 pdf-as-4-4566ef134c84c31b294ade015bc7e62b9c47ae79.zip | |
Merge branch 'master'
# Conflicts:
# pdf-as-web/src/main/java/at/gv/egiz/pdfas/web/helper/PdfAsHelper.java
# pdf-as-web/src/main/java/at/gv/egiz/pdfas/web/servlets/JSONAPIServlet.java
# pdf-as-web/src/main/java/at/gv/egiz/pdfas/web/ws/PDFASSigningImpl.java
Diffstat (limited to 'cpycommands.txt')
0 files changed, 0 insertions, 0 deletions