Madhura Bhave 80610fa250 Restore order of additional and active profiles ...

This commit restores the order of additional and active profiles
so that active profiles now take precedence.

Fixes gh-26189

2021-05-19 13:21:03 -07:00

..

src

Restore order of additional and active profiles

2021-05-19 13:21:03 -07:00

build.gradle

Merge branch '2.3.x' into 2.4.x

2021-05-17 13:49:25 +01:00