Close #21786 Merged manually to solve conflict on binary file

Browse Source

...

This commit is contained in:

Laurent Destailleur 2022-08-22 12:17:26 +02:00

parent 88e66ab39a

commit 6e800fe342

3 changed files with 0 additions and 0 deletions

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

BIN

htdocs/install/doctemplates/websites/website_template-style01.jpg Normal file

View File

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 20 KiB

BIN

htdocs/install/doctemplates/websites/website_template-style01.png

View File

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 45 KiB

BIN

htdocs/install/doctemplates/websites/website_template-style01.zip

View File

Binary file not shown.