Historical Rules · 30 September 2016
Rule 511.2
Official source text from the 30 September 2016 Rules release
Abilities that trigger “at end of combat” trigger as the end of combat damage step begins. Abilities that last “until end of combat” expire at the end of the combat phase.