Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/mp/tuxbox

Browse Source

Conflicts:
	data/locale/deutsch.locale
	data/locale/english.locale
	src/zapit/src/frontend.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: caf1b5d31e
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-29 (Wed, 29 Nov 2017)



------------------
This commit was generated by Migit

...

This commit is contained in:

vanhofen

2017-11-29 09:51:59 +01:00

parent eb616062fa df6e7f7f37

commit b3d262b045

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available