Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/feature/EAK-542' into feature/EA…
Browse files Browse the repository at this point in the history 
…K-542

# Conflicts:
#	plugin/src/main/java/com/exadel/aem/toolkit/plugin/maven/PluginSettings.java
  • Loading branch information
@smiakchilo
smiakchilo committed Aug 21, 2024
2 parents 9e91090 + 2338f88 commit 2e4f06a
Showing 0 changed files with 0 additions and 0 deletions.

0 comments on commit 2e4f06a

Please sign in to comment.