diff --git a/History.markdown b/History.markdown index 8393ff2d7..7ed77985e 100644 --- a/History.markdown +++ b/History.markdown @@ -12,6 +12,7 @@ * Update resources.md (#7864) * Extra apostrophes in an URL (#8319) * Clarify target of subordinate clause (#8320) + * Cherry-pick commits from conflicting branch `docs-40` ### Development Fixes