mirror of
https://github.com/facebook/react.git
synced 2025-11-01 09:12:30 +00:00
02de96f012
This fixes merging of `propTypes`, `contextTypes`, and `childContextTypes` so that we actually merge (instead of only taking the component or last mixin).