Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master' into feature/remove-db-a…
Browse files Browse the repository at this point in the history
…bstract

* origin/master:
  Fixed all the clients' models unlink when a single one is removed.
  Update ApiUserTwoFAController.php
  Update ClientService.php
  Added the missing space in the sql.
  Added the password reset when 1st user's email is changed.

# Conflicts:
#	src/Model/Table/ClientModelTable.php
#	src/Service/ClientService.php
  • Loading branch information
ruslanbaidan committed Dec 8, 2023
2 parents 8ddf830 + f4f47f4 commit 9f644f8
Showing 0 changed files with 0 additions and 0 deletions.

0 comments on commit 9f644f8

Please sign in to comment.