4 Commits

Author	SHA1	Message	Date
Rui Tome	18592e4f0a	Merge branch 'feature/flexible-collections' into flexible-collections/deprecate-custom-collection-perm ... # Conflicts: # src/Api/AdminConsole/Controllers/GroupsController.cs # src/Api/AdminConsole/Controllers/OrganizationUsersController.cs # src/Core/Services/Implementations/OrganizationService.cs	2023-10-25 16:29:21 +01:00
Thomas Rittson	cd376bee7f	Merge remote-tracking branch 'origin/master' into feature/flexible-collections	2023-10-23 08:47:11 +10:00
Thomas Rittson	c1cf07d764	[AC-1750] AC Team code ownership moves - Groups (#3358)	2023-10-20 06:37:46 +10:00
Thomas Rittson	37e9d70bee	AC Team code ownership moves - Api project (#3351)	2023-10-18 11:27:56 -04:00