Merge branch 'master' into next
authorMatthias Schmidt <gravatronics@live.com>
Sun, 27 Jan 2019 14:12:00 +0000 (15:12 +0100)
committerMatthias Schmidt <gravatronics@live.com>
Sun, 27 Jan 2019 14:12:00 +0000 (15:12 +0100)
commit0161da48c7e4fa777f88ad837cbfa7098c960959
treebfc999cff814fdbb3c0774047faeedd19761c207
parent434fee8c5b4e34feb54ef51ee3dabc4c53bdfddf
parent552667fb75856750ef53e704110756b88e95fc58
Merge branch 'master' into next
com.woltlab.wcf/templates/mediaBBCodeTag.tpl
wcfsetup/install/files/acp/templates/mediaBBCodeTag.tpl
wcfsetup/install/files/lib/data/comment/CommentAction.class.php