Merge remote-tracking branch 'origin/master'

This commit is contained in:
Hexalyse 2015-08-22 17:24:03 +02:00
commit 89bfc2ffe0

View file

@ -63,7 +63,7 @@
</div> </div>
<div id="opendisc" class="button hidden"> <div id="opendisc" class="button hidden">
<input type="checkbox" id="opendiscussion" name="opendiscussion" {if="!$OPENDISCUSSION"} disabled="disabled"{/if} /> <input type="checkbox" id="opendiscussion" name="opendiscussion" {if="!$OPENDISCUSSION"} disabled="disabled"{/if} />
<label for="opendiscussion">Open discussion</label> <label for="opendiscussion" {if="!$OPENDISCUSSION"} style="color: #BBBBBB;"{/if}>Open discussion</label>
</div> </div>
<input id="password" placeholder="Optional password (recommended)" size="32" /> <input id="password" placeholder="Optional password (recommended)" size="32" />
</div> </div>