Merge branch 'integration' into kraikrit
# Conflicts: # www/src/Controller/ProfilesController.php
Showing
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
www/src/Template/Email/html/notification.ctp
0 → 100644
www/src/Template/Users/verify.ctp
0 → 100644
Please
register
or
sign in
to comment