mirror of
https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git
synced 2025-09-02 10:21:04 +02:00
Merge branch 'master' into pu/msgbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: aae4411d03
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-10-29 (Sat, 29 Oct 2016)
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
This commit is contained in:
@@ -2128,8 +2128,12 @@ const char * locale_real_names[] =
|
||||
"remotebox_channel_na",
|
||||
"remotebox_del",
|
||||
"remotebox_head",
|
||||
"remotebox_ip",
|
||||
"remotebox_mod",
|
||||
"remotebox_pass",
|
||||
"remotebox_port",
|
||||
"remotebox_rbaddr",
|
||||
"remotebox_rbname",
|
||||
"remotebox_user",
|
||||
"reset_all",
|
||||
"reset_channels",
|
||||
"reset_confirm",
|
||||
|
Reference in New Issue
Block a user