Merge branch 'develop' into fix/fix-error-handling-in-profile-tab

This commit is contained in:
Shpuld Shpuldson 2020-12-02 12:48:21 +02:00
commit b537032e6d
71 changed files with 6097 additions and 1415 deletions

View file

@ -11,21 +11,21 @@
</div>
<div class="image-cropper-buttons-wrapper">
<button
class="btn"
class="button-default btn"
type="button"
:disabled="submitting"
@click="submit()"
v-text="saveText"
/>
<button
class="btn"
class="button-default btn"
type="button"
:disabled="submitting"
@click="destroy"
v-text="cancelText"
/>
<button
class="btn"
class="button-default btn"
type="button"
:disabled="submitting"
@click="submit(false)"