Merge branch 'master' into next
authorMatthias Schmidt <gravatronics@live.com>
Sun, 7 Apr 2019 14:47:59 +0000 (16:47 +0200)
committerMatthias Schmidt <gravatronics@live.com>
Sun, 7 Apr 2019 14:47:59 +0000 (16:47 +0200)
commitf4ba31324cc716c1d3e7a11bb9a121eed6320214
treed868d87e03f0af33b8b3a785da61b268d8cb3d0f
parent71ebdb351f50c3f72a647eb332e2fcfcab70f5b4
parent9d433b48f80f84806a6f1bcff2116ddf2960782d
Merge branch 'master' into next
com.woltlab.wcf/templates/__messageFormSmilies.tpl
wcfsetup/install/files/lib/data/smiley/Smiley.class.php