There were rumors the feud was over, but this is the first visual evidence. Pretty amazing ... considering the beef exploded 2 years ago in a massive brawl at W.I.P. nightclub in NYC. Chris and a bodyguard were left bloodied, and NBA star Tony Parker suffered a serious eye injury.
The peace has been brewing since last April when we spotted Chris in a club dancing to "Started From the Bottom" -- but, yeah ... they've come a really long way.