Skip to content

Commit

Permalink
Merge branch '5.0'
Browse files Browse the repository at this point in the history
# Conflicts:
#	Resources/Private/Fusion/Prototypes/Picture.fusion
  • Loading branch information
mficzel committed Dec 16, 2020
2 parents 2601ebb + 6954b64 commit e0dd81c
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion Resources/Private/Fusion/Prototypes/Image.fusion
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ prototype(Sitegeist.Kaleidoscope:Image) < prototype(Neos.Fusion:Component) {
imageSource = null
srcset = null
sizes = null
alt = null
alt = ''
title = null
class = null
loading = null
Expand Down
2 changes: 1 addition & 1 deletion Resources/Private/Fusion/Prototypes/Picture.fusion
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ prototype(Sitegeist.Kaleidoscope:Picture) < prototype(Neos.Fusion:Component) {
formats = null
width = null
height = null
alt = null
alt = ''
title = null
class = null
content = ''
Expand Down

0 comments on commit e0dd81c

Please sign in to comment.