diff options
| author | HJ <spam@hjkos.com> | 2018-12-14 14:25:16 +0000 |
|---|---|---|
| committer | HJ <spam@hjkos.com> | 2018-12-14 14:25:16 +0000 |
| commit | 70ff9ce2b562afb8755ac50d43964e9824439b1f (patch) | |
| tree | d1ae9a7a18bb36012aa747a88ba77a6782b990c2 /src | |
| parent | a158e75a04efb9b876330326b8bc1e03d2c12041 (diff) | |
| parent | b4b819f4f4462f11396fcbb107149aed18454b53 (diff) | |
Merge branch 'fix-preload-nsfw' into 'develop'
Fix preload images option being always disabled
See merge request pleroma/pleroma-fe!421
Diffstat (limited to 'src')
| -rw-r--r-- | src/components/settings/settings.vue | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/components/settings/settings.vue b/src/components/settings/settings.vue index 3f920de5..39125009 100644 --- a/src/components/settings/settings.vue +++ b/src/components/settings/settings.vue @@ -120,7 +120,7 @@ </li> <ul class="setting-list suboptions" > <li> - <input :disabled="!hideAttachmentsInConvLocal" type="checkbox" id="preloadImage" v-model="preloadImage"> + <input :disabled="!hideNsfwLocal" type="checkbox" id="preloadImage" v-model="preloadImage"> <label for="preloadImage">{{$t('settings.preload_images')}}</label> </li> </ul> |