fixed conflicts with dev

Browse Source

...

This commit is contained in:

Nuno Coração

2023-01-16 23:35:49 +00:00

parent 627062024d 1fe837b27f

commit 7e83b581e8

3 changed files with 58 additions and 63 deletions

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

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

BIN

exampleSite/resources/_gen/images/docs/shortcodes/abstract_hu684c0a32e4d0f58583128be29b348bb9_40710_0x300_resize_q75_box.jpg Normal file

Binary file not shown.

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

BIN

exampleSite/resources/_gen/images/docs/shortcodes/featured_huccf4470440ae6b15644c014dfa031fdc_4868633_0x300_resize_box_3.png Normal file

Binary file not shown.

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