Merge branch 'develop' into setttingssync
This commit is contained in:
commit
3530830b07
134 changed files with 1411 additions and 1299 deletions
|
|
@ -157,7 +157,7 @@
|
|||
</BooleanSetting>
|
||||
</li>
|
||||
<li
|
||||
v-if="!blockExpirationSupported"
|
||||
v-if="!blockExpiration"
|
||||
>
|
||||
<BooleanSetting
|
||||
path="modalOnBlock"
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue