Merge branch 'feature/IVYPORTAL-17431-Remove-Express-from-Portal' of … · axonivy-market/portal@77d1991 · GitHub

Commit

Merge branch 'feature/IVYPORTAL-17431-Remove-Express-from-Portal' of …

Browse files

…github.com:axonivy-market/portal into feature/IVYPORTAL-17431-Remove-Express-from-Portal

# Conflicts:
#	AxonIvyPortal/PortalKitTestHelper/processes/Start Processes/GrantPermissions.p.json
#	AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/enums/PortalPermission.java
#	AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/security/PortalSecurity.java

Loading branch information

ntloc-axonivy committed Sep 23, 2024

2 parents 1f6f575 + 8627c1c commit 77d1991