merge: develop

This commit is contained in:
Mar0xy 2023-11-04 21:52:12 +01:00
commit db29a5c2da
No known key found for this signature in database
GPG key ID: 56569BBE47D2C828
134 changed files with 282 additions and 282 deletions

View file

@ -26,7 +26,7 @@ SPDX-License-Identifier: AGPL-3.0-only
<span v-if="user.isLocked" :title="i18n.ts.isLocked"><i class="ph-lock ph-bold ph-lg"></i></span>
<span v-if="user.isBot" :title="i18n.ts.isBot"><i class="ph-robot ph-bold ph-lg"></i></span>
<button v-if="!isEditingMemo && !memoDraft" class="_button add-note-button" @click="showMemoTextarea">
<i class="ph-pencil-line ph-bold pg-lg"/> {{ i18n.ts.addMemo }}
<i class="ph-pencil-line ph-bold ph-lg"/> {{ i18n.ts.addMemo }}
</button>
</div>
</div>