Merge branch 'master' into 4901PdfSplit
# Conflicts: # extension/Documentation/Manual.rst
.gitlab-ci.yml
0 → 100644
This diff is collapsed.
bower.json
deleted
100644 → 0
composer.json
0 → 100644
{ | ||
"require-dev": { | ||
"phpunit/phpunit": "^6.5" | ||
} | ||
} |
composer.lock
0 → 100644
This diff is collapsed.