Drake and Diddy have officially squashed their beef, and now they hang out on the regular, according to TMZ.

Multiple sources tell TMZ that Drake and Diddy have been chillin' frequently since they patched up their differences. In case you forgot, the two got into a fight at club LIV in Miami in late 2014. Now, though, Drizzy and Puff appear to be on great terms.

According to TMZ, Diddy's been hosting a "boot camp" in Pennsylvania in preparation for his upcoming Bad Boy Family Reunion tour. Drake apparently hooked Diddy up with tickets to the former's concert in North Carolina a few days ago, and then later took a private jet to watch the concert as a fan.

Also, at yesterday's MTV Video Music Awards, Diddy handed out the moon man for best hip-hop video of the year. The New York rap mogul announced Drizzy as the winner and gave him a shout-out, which pretty much confirms that they're boys now. Diddy said, "Drake is stuck in traffic, so I'mma take this one with me all the way back to the crib. Yo Drake, come get this. Yeah, give it up for Drake y'all!"

In other Drake-related news, the Toronto artist was recently in Atlanta and paid a visit to the Hawks' practice facility. Drizzy ended up sinking a halfcourt shot from the seat of his pants. No word on how many tries it took him, but still, pretty impressive from someone who is pretty terrible at basketball.

You can check out grainy photos of Diddy at Drake's concert above via Twitter. Could Drake and Diddy be cooking up new music together, or is Drake going to pop out at one of Diddy's upcoming shows? Only time will tell.

34 Rappers Going Platinum in 2016