diff options
| author | emusic <emina.music@egiz.gv.at> | 2018-07-27 12:31:04 +0200 |
|---|---|---|
| committer | emusic <emina.music@egiz.gv.at> | 2018-07-27 12:31:04 +0200 |
| commit | 3e224770ad6db67f1ca818fd6de52b7e3c3b8863 (patch) | |
| tree | cf0f2d344d1a33afa0aa1505e729eea16dc1ebac /pdf-as-pdfbox-2/src/main/resources/META-INF | |
| parent | 236cd00a49b04523a325e06fdc8839be9049f892 (diff) | |
| parent | 1e2919e08a871581654ab88004c11921a56469b3 (diff) | |
| download | pdf-as-4-3e224770ad6db67f1ca818fd6de52b7e3c3b8863.tar.gz pdf-as-4-3e224770ad6db67f1ca818fd6de52b7e3c3b8863.tar.bz2 pdf-as-4-3e224770ad6db67f1ca818fd6de52b7e3c3b8863.zip | |
Merge branch 'SL20_development' of gitlab.iaik.tugraz.at:egiz/pdf-as-4 into SL20_development
# Conflicts:
# pdf-as-lib/src/main/java/at/gv/egiz/sl20/utils/SL20JSONBuilderUtils.java
# pdf-as-web/src/main/java/at/gv/egiz/pdfas/web/helper/PdfAsHelper.java
Diffstat (limited to 'pdf-as-pdfbox-2/src/main/resources/META-INF')
0 files changed, 0 insertions, 0 deletions