Who D.J. Ended Up With In Fuller House Season 2

For the months between the seasons, fans have been wondering who D.J. was going to end up with: Steve or Matt?