diff options
| author | Shpuld Shpludson <shp@cock.li> | 2018-12-13 15:04:55 +0000 |
|---|---|---|
| committer | Shpuld Shpludson <shp@cock.li> | 2018-12-13 15:04:55 +0000 |
| commit | aa7cff92aab00826ec1e794661d09a5e6d29c045 (patch) | |
| tree | 37d01613bdaf1eebc11c5581f43daff319482726 /src/components/attachment | |
| parent | 25a88da17abf9ab1282076aa52f2f061b341fc0d (diff) | |
| parent | f4ee222e3c13caf51ad15d820a75665a3f1a51e3 (diff) | |
Merge branch 'feature/configurable-nsfw-censor-image' into 'develop'
make nsfw censor image configurable
See merge request pleroma/pleroma-fe!243
Diffstat (limited to 'src/components/attachment')
| -rw-r--r-- | src/components/attachment/attachment.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/components/attachment/attachment.js b/src/components/attachment/attachment.js index 16114c30..97c4f283 100644 --- a/src/components/attachment/attachment.js +++ b/src/components/attachment/attachment.js @@ -11,7 +11,7 @@ const Attachment = { ], data () { return { - nsfwImage, + nsfwImage: this.$store.state.config.nsfwCensorImage || nsfwImage, hideNsfwLocal: this.$store.state.config.hideNsfw, preloadImage: this.$store.state.config.preloadImage, loopVideo: this.$store.state.config.loopVideo, |