diff options
| author | Sean King <seanking2919@protonmail.com> | 2022-08-07 06:38:56 +0000 |
|---|---|---|
| committer | Sean King <seanking2919@protonmail.com> | 2022-08-07 06:38:56 +0000 |
| commit | 572f28d7c9efea4300cb88063baf4daab91e7910 (patch) | |
| tree | 29d966a1b7141f6a768120497d3f34143f467212 /src/components/settings_modal/tabs/profile_tab.vue | |
| parent | 18d69f93d38dc15a74db81ee4c10b4766bebfc35 (diff) | |
| parent | 6a2f4270727913b8e5d4670b5b3bbc3f57f51ec5 (diff) | |
Merge branch 'fix/merge-conflicts/report-notifications' into 'feat/report-notification'
Fixing merge conflicts and lint for report notifications MR
See merge request pleroma/pleroma-fe!1585
Diffstat (limited to 'src/components/settings_modal/tabs/profile_tab.vue')
| -rw-r--r-- | src/components/settings_modal/tabs/profile_tab.vue | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/components/settings_modal/tabs/profile_tab.vue b/src/components/settings_modal/tabs/profile_tab.vue index 4cd93772..642d54ca 100644 --- a/src/components/settings_modal/tabs/profile_tab.vue +++ b/src/components/settings_modal/tabs/profile_tab.vue @@ -117,8 +117,8 @@ <button v-if="!isDefaultAvatar && pickAvatarBtnVisible" :title="$t('settings.reset_avatar')" - @click="resetAvatar" class="button-unstyled reset-button" + @click="resetAvatar" > <FAIcon icon="times" |