Rework how disambiguation is handled#1673

Closed

SimonBrandner wants to merge 9 commits intomatrix-org:developfrom SimonBrandner:disambiguate-prop

+39-28

Commits on Apr 18, 2021

Rework how disambiguation is handled
SimonBrandner
committed

Commits on Apr 21, 2021

Merge branch 'develop' into disambiguate-prop
SimonBrandner
committed

Commits on Apr 22, 2021

Improve wording

SimonBrandner
and
turt2live
authored

Commits on Jun 8, 2021

Merge remote-tracking branch 'upstream/develop' into disambiguate-prop
SimonBrandner
committed