diff options
| author | Shpuld Shpludson <shp@cock.li> | 2019-01-31 19:21:49 +0000 |
|---|---|---|
| committer | Shpuld Shpludson <shp@cock.li> | 2019-01-31 19:21:49 +0000 |
| commit | 1a6207be1d81f8270840667babe262c24e53f1d7 (patch) | |
| tree | f5c6319ad59940b338e41a32ac3614c743709a38 /src/components/user_settings/user_settings.vue | |
| parent | 3e4c598af471d52664b22ad11435e9df2a8f2677 (diff) | |
| parent | 476bf0afe1c890b0f08587b3942981c8c591c7be (diff) | |
Merge branch 'fix/add-option-to-not-render-background-tabs' into 'develop'
Fix #298 Add option to tab switcher to not render background tabs
Closes #298
See merge request pleroma/pleroma-fe!504
Diffstat (limited to 'src/components/user_settings/user_settings.vue')
| -rw-r--r-- | src/components/user_settings/user_settings.vue | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/components/user_settings/user_settings.vue b/src/components/user_settings/user_settings.vue index 253bbd34..993675ba 100644 --- a/src/components/user_settings/user_settings.vue +++ b/src/components/user_settings/user_settings.vue @@ -130,7 +130,7 @@ <div class="setting-item"> <h2>{{$t('settings.follow_import')}}</h2> <p>{{$t('settings.import_followers_from_a_csv_file')}}</p> - <form v-model="followImportForm"> + <form> <input type="file" ref="followlist" v-on:change="followListChange"></input> </form> <i class=" icon-spin4 animate-spin uploading" v-if="followListUploading"></i> |