Merge branch 'master' into develop

This commit is contained in:
Tobias Diekershoff 2019-01-21 10:04:26 +01:00
commit 08206fdcc0
29 changed files with 135 additions and 133 deletions

View file

@ -16,8 +16,8 @@
{{include file="field_textarea.tpl" field=$publickey}}
<div class="form-group pull-right settings-submit-wrapper" >
<button type="submit" name="securemail-submit" class="btn btn-primary" value="{{$submit|escape:'html'}}">{{$submit}}</button>
<button type="submit" name="securemail-submit" class="btn btn-default" value="{{$test|escape:'html'}}">{{$test}}</button>
<button type="submit" name="securemail-submit" class="btn btn-primary" value="{{$submit}}">{{$submit}}</button>
<button type="submit" name="securemail-submit" class="btn btn-default" value="{{$test}}">{{$test}}</button>
</div>
<div class="clear"></div>
</div>