Merge branch 'master' into feat/mediaFocalAlt

This commit is contained in:
les
2021-07-19 12:33:12 +02:00
8 changed files with 283 additions and 253 deletions

View File

@@ -11,8 +11,8 @@
v-card-text(v-show='!!message') {{ message }}
v-card-actions
v-spacer
v-btn(color='error' @click='cancel') {{$t('common.cancel')}}
v-btn(color='primary' @click='agree') {{$t('common.ok')}}
v-btn(text color='error' @click='cancel') {{$t('common.cancel')}}
v-btn(text color='primary' @click='agree') {{$t('common.ok')}}
</template>
<script>