Skip to content
Snippets Groups Projects
Commit 20f06b90 authored by Damyan Mitev's avatar Damyan Mitev :beach:
Browse files

Merge branch '268-convert-odt-file-to-pdf' of... 

Merge branch '268-convert-odt-file-to-pdf' of ssh://git@code.vereign.com:10022/code/vcl.git into 268-convert-odt-file-to-pdf

Conflicts:
	javascript/src/iframe/viamapi-iframe.js
	javascript/src/lib/pdfjs.parser.js
	javascript/src/utilities/pdfUtilities.js
parents 9ac4f8f7 526c4437
No related branches found
No related tags found
3 merge requests!48269 implement workflow for signing already uploaded document dev,!47269 implement workflow for signing already uploaded document,!41268 convert odt file to pdf
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment