Merge branch 'main' into switchedToIconsAndFormatting

Browse Source

# Conflicts:
#	src/main/resources/messages_ar_AR.properties
#	src/main/resources/messages_fr_FR.properties
#	src/main/resources/static/general.css
#	src/main/resources/templates/add-image.html
#	src/main/resources/templates/compress-pdf.html
#	src/main/resources/templates/convert/img-to-pdf.html
#	src/main/resources/templates/convert/pdf-to-img.html
#	src/main/resources/templates/fragments/navbar.html
#	src/main/resources/templates/home.html
#	src/main/resources/templates/merge-pdfs.html
#	src/main/resources/templates/pdf-organizer.html
#	src/main/resources/templates/remove-pages.html
#	src/main/resources/templates/rotate-pdf.html
#	src/main/resources/templates/security/add-password.html
#	src/main/resources/templates/security/add-watermark.html
#	src/main/resources/templates/security/change-permissions.html
#	src/main/resources/templates/security/remove-password.html
#	src/main/resources/templates/split-pdfs.html

...

This commit is contained in:

Saud Fatayerji 2023-02-07 19:16:56 +03:00

parent f191ff342d 75d841083c

commit 316c4b6f99

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available