ferferga 6a596bd497 Fix merge conflicts

2020-05-16 18:07:32 +02:00

..

guide-settings.js

Remove dead code

2020-02-26 02:00:13 -05:00

guide-settings.template.html

Fix more accessibility and blockers

2020-05-08 10:44:42 +02:00

guide.css

Fix intentation (CSS)

2020-01-25 11:42:43 +01:00

guide.js

Force the use of single quotes

2020-05-04 12:44:12 +02:00

programs.css

Fix color-hex-length (CSS)

2020-01-25 11:34:12 +01:00

tvguide.template.html

Fix merge conflicts

2020-05-16 18:07:32 +02:00