e75e4580ae
Conflicts: testsuite/integration-arquillian/pom.xml |
||
---|---|---|
.. | ||
account-api | ||
account-freemarker | ||
common-freemarker | ||
common-themes | ||
email-api | ||
email-freemarker | ||
login-api | ||
login-freemarker | ||
pom.xml |
e75e4580ae
Conflicts: testsuite/integration-arquillian/pom.xml |
||
---|---|---|
.. | ||
account-api | ||
account-freemarker | ||
common-freemarker | ||
common-themes | ||
email-api | ||
email-freemarker | ||
login-api | ||
login-freemarker | ||
pom.xml |