Merge pull request #5218 from ababic/feature/updates-for-5147

CHANGELOG and release notes updates for PR #5147

CHANGELOG.txt

@@ -5,6 +5,7 @@ Changelog
 ~~~~~~~~~~~~~~~~
 
  * Removed support for Python 3.4
+ * Added support for `short_description` for field labels in modeladmin's `InspectView` (Wesley van Lee)
 
 
 2.5 (xx.xx.xxxx) - IN DEVELOPMENT

docs/releases/2.6.rst

@@ -14,7 +14,7 @@ What's new
 Other features
 ~~~~~~~~~~~~~~
 
- * ...
+ * Added support for ``short_description`` for field labels in modeladmin's ``InspectView`` (Wesley van Lee)
 
 
 Bug fixes