merged from develop

2017-08-13 17:07:36 +02:00
parent ebda6babdd
commit ed553f5cae
398 changed files with 10399 additions and 2029 deletions
--- a/mediaserver/platformcode/template/html/config_container.html
+++ b/mediaserver/platformcode/template/html/config_container.html
@@ -0,0 +1 @@
+<ul class="settings_list" style="display:none" id="%item_id">%item_value</ul>
				`@@ -0,0 +1 @@`
				`<ul class="settings_list" style="display:none" id="%item_id">%item_value</ul>`