diff options
| author | HJ <30-hj@users.noreply.git.pleroma.social> | 2019-07-15 06:50:31 +0000 |
|---|---|---|
| committer | HJ <30-hj@users.noreply.git.pleroma.social> | 2019-07-15 06:50:31 +0000 |
| commit | 0c064105841608c93649992eeb609e63b73ad595 (patch) | |
| tree | 1483d2fbdc42abe43aefefc9a27c25ecdcb68dcf /src/components/progress_button/progress_button.vue | |
| parent | 0a7c60c30376dfa0bb3058b16f0e59485f5397c6 (diff) | |
| parent | ff90d864ccccd33e9d2cfb7ef64afa2486c537a0 (diff) | |
Merge branch '482-subscribe-user' into 'develop'
Implement ability to subscribe to a user
Closes #482
See merge request pleroma/pleroma-fe!771
Diffstat (limited to 'src/components/progress_button/progress_button.vue')
| -rw-r--r-- | src/components/progress_button/progress_button.vue | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/components/progress_button/progress_button.vue b/src/components/progress_button/progress_button.vue index d19aa97d..283a51af 100644 --- a/src/components/progress_button/progress_button.vue +++ b/src/components/progress_button/progress_button.vue @@ -3,7 +3,7 @@ :disabled="progress || disabled" @click="onClick" > - <template v-if="progress"> + <template v-if="progress && $slots.progress"> <slot name="progress" /> </template> <template v-else> |