Skip to content

Merge ours for CSS and JS files, merge theirs for CHANGELOG.md. Added image processing command and dependencies in composer.json. #3

Merge ours for CSS and JS files, merge theirs for CHANGELOG.md. Added image processing command and dependencies in composer.json.

Merge ours for CSS and JS files, merge theirs for CHANGELOG.md. Added image processing command and dependencies in composer.json. #3