Multiple witnesses tell TMZ Sports ... Draymond Green and Tristan Thompson cooled off and actually dapped each other up after a heated altercation at an ESPY's afterparty.
We spoke with multiple people who were inside Delilah nightclub on July 19th when Draymond and Tristan came face to face.
Everyone we spoke to says it did not appear Tristan actually punched Draymond -- but he did make an aggressive gesture toward him.
LeBron and Kevin Durant did intervene and diffused the situation.
We're told when things cooled off ... Draymond and Tristan talked things out and actually made peace.