Merge branch 'fix-preload-nsfw' into 'develop'

Fix preload images option being always disabled

See merge request pleroma/pleroma-fe!421
This commit is contained in:
HJ 2018-12-14 14:25:16 +00:00
commit 70ff9ce2b5

View file

@ -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>