1 commit

Author	SHA1	Message	Date
Matt Martz	0bbb67383b	Backport #38827 for 2.5 - Allow inheriting attrs from static parents (#38847) ... * Skip self._parent on dynamic, defer to grandparent for attr lookup (#38827) * Skip self._parent on dynamic, defer to grandparent for attr lookup * Revert _inheritable * Add tests for include inheritance from static blocks Fixes #38037 #36194 (cherry picked from commit 354aa8d602) * Add changelog for #38827	2018-04-20 11:45:28 -05:00