Merge branch 'master' into next
authorTim Düsterhus <duesterhus@woltlab.com>
Fri, 25 Oct 2019 11:24:33 +0000 (13:24 +0200)
committerTim Düsterhus <duesterhus@woltlab.com>
Fri, 25 Oct 2019 11:24:33 +0000 (13:24 +0200)
commitcc57ed574fcc65e7042104588b22af784933c2c0
tree0f6aad9accf2825a20682f91ab24b5cd0684c6a8
parent500a08d3302997ffc469e902efa9e426904157c8
parent62ebbb066a0cd691bfcc9d7ef9c7dba095cab730
Merge branch 'master' into next
wcfsetup/install/files/lib/system/template/plugin/LinkBlockTemplatePlugin.class.php