The two-year-long feud between the Florida governor and entertainment giant began when the company criticised anti-LGBT+ state legislation