Merge remote-tracking branch 'upstream/master'

This commit is contained in:
Brinken
2012-09-02 13:37:40 +02:00
10 changed files with 227 additions and 116 deletions
+4 -1
View File
@@ -618,7 +618,10 @@ m<%inherit file="base.html"/>
</div>
<div id="nmaoptions">
<div class="row">
<label>NotifyMyAndroid API Key</label>
<div class="row checkbox">
<input type="checkbox" name="nma_onsnatch" value="1" ${config['nma_onsnatch']} /><label>Notify on snatch?</label>
</div>
<label>NotifyMyAndroid API Key</label>
<input type="text" name="nma_apikey" value="${config['nma_apikey']}" size="30">
<small>Separate multiple api keys with commas</small>
</div>