bridge bf0b58b4b6 Merge remote-tracking branch 'upstream/2.X' into 2.X ... # Conflicts: # plugin/build.gradle		2024-11-26 17:39:35 +01:00
..
src/main	Merge remote-tracking branch 'upstream/2.X' into 2.X	2024-11-26 17:39:35 +01:00
build.gradle	Merge remote-tracking branch 'upstream/2.X' into 2.X	2024-11-26 17:39:35 +01:00