therwi/sunkkoma
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge develop and fix conflict

Browse source
This commit is contained in:
shpuld 2019-01-26 17:50:41 +02:00
commit 0ab828bb30
25 changed files with 2489 additions and 312 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/components/attachment/attachment.js
View file

@ -14,7 +14,7 @@ const Attachment = {
],
data () {
return {
nsfwImage: this.$store.state.config.nsfwCensorImage || nsfwImage,
nsfwImage: this.$store.state.instance.nsfwCensorImage || nsfwImage,
hideNsfwLocal: this.$store.state.config.hideNsfw,
preloadImage: this.$store.state.config.preloadImage,
loading: false,