Merge remote-tracking branch 'NovaXeros/patch-1' into develop

Conflicts:
	headphones/notifiers.py
This commit is contained in:
rembo10
2014-04-17 17:17:25 -07:00
2 changed files with 7 additions and 12 deletions

View File

@@ -678,9 +678,9 @@
</div>
</fieldset>
<fieldset>
<h3>LMS</h3>
<h3>Logitech Media Server</h3>
<div class="checkbox row">
<input type="checkbox" name="lms_enabled" id="lms" value="1" ${config['lms_enabled']} /><label>Enable Squeezebox Updates</label>
<input type="checkbox" name="lms_enabled" id="lms" value="1" ${config['lms_enabled']} /><label>Enable LMS Updates</label>
</div>
<div id="lmsoptions">
<div class="row">