Merge remote-tracking branch 'upstream/dev' into doco
This commit is contained in:
@@ -1,4 +1,8 @@
|
||||
<div id="settings-nick-wrapper" class="section-content-info-wrapper">
|
||||
<div id="settings-nickname-desc">{{$desc}} <strong>'{{$nickname}}@{{$basepath}}'</strong>{{$subdir}}</div>
|
||||
<div id="settings-nickname-desc">{{$desc}} <strong>'{{$nickname}}@{{$basepath}}'</strong></div>
|
||||
{{if $davpath}}
|
||||
<br>
|
||||
<div id="settings-dav-desc">{{$davdesc}} <strong>'{{$davpath}}'</strong></div>
|
||||
{{/if}}
|
||||
</div>
|
||||
<div id="settings-nick-end" ></div>
|
||||
|
||||
Reference in New Issue
Block a user