Commit Graph

2 Commits

Author SHA1 Message Date
vanhofen
49500d9b97 yWeb: add possibility to edit rssreader.conf and 2webTVxmlUrls.conf
Origin commit data
------------------
Commit: 21907a20c7
Author: vanhofen <vanhofen@gmx.de>
Date: 2020-02-29 (Sat, 29 Feb 2020)

Origin message was:
------------------
- yWeb: add possibility to edit rssreader.conf and 2webTVxmlUrls.conf
2020-02-29 21:16:35 +01:00
vanhofen
5c391a82b8 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Conflicts:
	configure.ac


Origin commit data
------------------
Commit: 624691ea0d
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-12-15 (Thu, 15 Dec 2016)
2016-12-15 14:12:33 +01:00