The CBS-Dish standoff is over. The two companies reached a new carriage agreement Friday night after about a 12-hour blackout of CBS stations on the satellite service.

The new multiyear deal gives Dish carriage rights to cable channels including the CBS Sports Network, Smithsonian Channel, TVGN and Showtime Networks, as well as CBS-owned TV stations, The Wall Street Journal reports.

No financial terms were disclosed.

The Journal notes that Dish did not get rights to CBS programming for an “over the top” online video service it is planning, but it did get the rights to offer Showtime on mobile devices. WSJ reports that the deal also “includes a path to offer an online version of Showtime to people who aren’t pay-TV customers.”

Moreover, the agreement ended a dispute over the ad-skipping feature in Dish’s digital video recorder. “Under the agreement, consumers watching CBS-owned TV stations through Dish won’t be able to access that feature until seven days after a show airs,” WSJ reports.